[Midnightbsd-cvs] src [9358] trunk/lib/libkvm/kvm.c: Use O_CLOEXEC instead of separate fcntl(F_SETFD) call.

[laffer1 at midnightbsd.org]

Revision: 9358
          http://svnweb.midnightbsd.org/src/?rev=9358
Author:   laffer1
Date:     2017-03-04 14:39:39 -0500 (Sat, 04 Mar 2017)
Log Message:
-----------
Use O_CLOEXEC instead of separate fcntl(F_SETFD) call.

Modified Paths:
--------------
    trunk/lib/libkvm/kvm.c

Modified: trunk/lib/libkvm/kvm.c
===================================================================
--- trunk/lib/libkvm/kvm.c	2017-03-04 19:39:13 UTC (rev 9357)
+++ trunk/lib/libkvm/kvm.c	2017-03-04 19:39:39 UTC (rev 9358)
@@ -166,7 +166,7 @@
 	if (mf == 0)
 		mf = _PATH_MEM;
 
-	if ((kd->pmfd = open(mf, flag, 0)) < 0) {
+	if ((kd->pmfd = open(mf, flag | O_CLOEXEC, 0)) < 0) {
 		_kvm_syserr(kd, kd->program, "%s", mf);
 		goto failed;
 	}
@@ -179,10 +179,6 @@
 		_kvm_syserr(kd, kd->program, "empty file");
 		goto failed;
 	}
-	if (fcntl(kd->pmfd, F_SETFD, FD_CLOEXEC) < 0) {
-		_kvm_syserr(kd, kd->program, "%s", mf);
-		goto failed;
-	}
 	if (S_ISCHR(st.st_mode)) {
 		/*
 		 * If this is a character special device, then check that
@@ -194,14 +190,11 @@
 			kd->vmfd = open(_PATH_DEVNULL, O_RDONLY);
 			return (kd);
 		} else if (strcmp(mf, _PATH_MEM) == 0) {
-			if ((kd->vmfd = open(_PATH_KMEM, flag)) < 0) {
+			if ((kd->vmfd = open(_PATH_KMEM, flag | O_CLOEXEC)) <
+			    0) {
 				_kvm_syserr(kd, kd->program, "%s", _PATH_KMEM);
 				goto failed;
 			}
-			if (fcntl(kd->vmfd, F_SETFD, FD_CLOEXEC) < 0) {
-				_kvm_syserr(kd, kd->program, "%s", _PATH_KMEM);
-				goto failed;
-			}
 			return (kd);
 		}
 	}
@@ -210,14 +203,10 @@
 	 * Initialize the virtual address translation machinery,
 	 * but first setup the namelist fd.
 	 */
-	if ((kd->nlfd = open(uf, O_RDONLY, 0)) < 0) {
+	if ((kd->nlfd = open(uf, O_RDONLY | O_CLOEXEC, 0)) < 0) {
 		_kvm_syserr(kd, kd->program, "%s", uf);
 		goto failed;
 	}
-	if (fcntl(kd->nlfd, F_SETFD, FD_CLOEXEC) < 0) {
-		_kvm_syserr(kd, kd->program, "%s", uf);
-		goto failed;
-	}
 	if (strncmp(mf, _PATH_FWMEM, strlen(_PATH_FWMEM)) == 0)
 		kd->rawdump = 1;
 	if (_kvm_initvtop(kd) < 0)