svn commit: r254289 - in head/lib/libc/db: btree hash

[Jilles Tjoelker]

Author: jilles
Date: Tue Aug 13 19:20:50 2013
New Revision: 254289
URL: http://svnweb.freebsd.org/changeset/base/254289

Log:
  db: Use O_CLOEXEC instead of separate fcntl() call.

Modified:
  head/lib/libc/db/btree/bt_open.c
  head/lib/libc/db/hash/hash_page.c

Modified: head/lib/libc/db/btree/bt_open.c
==============================================================================
--- head/lib/libc/db/btree/bt_open.c	Tue Aug 13 18:51:26 2013	(r254288)
+++ head/lib/libc/db/btree/bt_open.c	Tue Aug 13 19:20:50 2013	(r254289)
@@ -196,7 +196,7 @@ __bt_open(const char *fname, int flags, 
 			goto einval;
 		}
 
-		if ((t->bt_fd = _open(fname, flags, mode)) < 0)
+		if ((t->bt_fd = _open(fname, flags | O_CLOEXEC, mode)) < 0)
 			goto err;
 
 	} else {
@@ -207,9 +207,6 @@ __bt_open(const char *fname, int flags, 
 		F_SET(t, B_INMEM);
 	}
 
-	if (_fcntl(t->bt_fd, F_SETFD, 1) == -1)
-		goto err;
-
 	if (_fstat(t->bt_fd, &sb))
 		goto err;
 	if (sb.st_size) {
@@ -405,7 +402,7 @@ tmp(void)
 
 	(void)sigfillset(&set);
 	(void)_sigprocmask(SIG_BLOCK, &set, &oset);
-	if ((fd = mkstemp(path)) != -1)
+	if ((fd = mkostemp(path, O_CLOEXEC)) != -1)
 		(void)unlink(path);
 	(void)_sigprocmask(SIG_SETMASK, &oset, NULL);
 	return(fd);

Modified: head/lib/libc/db/hash/hash_page.c
==============================================================================
--- head/lib/libc/db/hash/hash_page.c	Tue Aug 13 18:51:26 2013	(r254288)
+++ head/lib/libc/db/hash/hash_page.c	Tue Aug 13 19:20:50 2013	(r254289)
@@ -862,10 +862,8 @@ open_temp(HTAB *hashp)
 	/* Block signals; make sure file goes away at process exit. */
 	(void)sigfillset(&set);
 	(void)_sigprocmask(SIG_BLOCK, &set, &oset);
-	if ((hashp->fp = mkstemp(path)) != -1) {
+	if ((hashp->fp = mkostemp(path, O_CLOEXEC)) != -1)
 		(void)unlink(path);
-		(void)_fcntl(hashp->fp, F_SETFD, 1);
-	}
 	(void)_sigprocmask(SIG_SETMASK, &oset, (sigset_t *)NULL);
 	return (hashp->fp != -1 ? 0 : -1);
 }