Author: kib
Date: Thu Jul 19 10:22:54 2012
New Revision: 238614
URL: http://svn.freebsd.org/changeset/base/238614
Log:
Implement F_DUPFD_CLOEXEC command for fcntl(2), specified by SUSv4.
PR: standards/169962
Submitted by: Jukka A. Ukkonen <jau iki fi>
MFC after: 1 week
Modified:
head/sys/kern/kern_descrip.c
head/sys/sys/fcntl.h
Modified: head/sys/kern/kern_descrip.c
==============================================================================
--- head/sys/kern/kern_descrip.c Thu Jul 19 09:32:59 2012
(r238613)
+++ head/sys/kern/kern_descrip.c Thu Jul 19 10:22:54 2012
(r238614)
@@ -113,6 +113,7 @@ static uma_zone_t file_zone;
/* Flags for do_dup() */
#define DUP_FIXED 0x1 /* Force fixed allocation */
#define DUP_FCNTL 0x2 /* fcntl()-style errors */
+#define DUP_CLOEXEC 0x4 /* Atomically set FD_CLOEXEC. */
static int closefp(struct filedesc *fdp, int fd, struct file *fp,
struct thread *td, int holdleaders);
@@ -479,6 +480,12 @@ kern_fcntl(struct thread *td, int fd, in
error = do_dup(td, DUP_FCNTL, fd, tmp, td->td_retval);
break;
+ case F_DUPFD_CLOEXEC:
+ tmp = arg;
+ error = do_dup(td, DUP_FCNTL | DUP_CLOEXEC, fd, tmp,
+ td->td_retval);
+ break;
+
case F_DUP2FD:
tmp = arg;
error = do_dup(td, DUP_FIXED, fd, tmp, td->td_retval);
@@ -895,6 +902,10 @@ do_dup(struct thread *td, int flags, int
* Duplicate the source descriptor.
*/
fdp->fd_ofiles[new] = fp;
+ if ((flags & DUP_CLOEXEC) != 0)
+ fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] | UF_EXCLOSE;
+ else
+ fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] & ~UF_EXCLOSE;
fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ UF_EXCLOSE;
if (new > fdp->fd_lastfile)
fdp->fd_lastfile = new;
Modified: head/sys/sys/fcntl.h
==============================================================================
--- head/sys/sys/fcntl.h Thu Jul 19 09:32:59 2012 (r238613)
+++ head/sys/sys/fcntl.h Thu Jul 19 10:22:54 2012 (r238614)
@@ -225,6 +225,9 @@ typedef __pid_t pid_t;
#define F_SETLK_REMOTE 14 /* debugging support for remote
locks */
#define F_READAHEAD 15 /* read ahead */
#define F_RDAHEAD 16 /* Darwin compatible read ahead
*/
+#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200809
+#define F_DUPFD_CLOEXEC 17 /* Like F_DUPFD, but FD_CLOEXEC
is set */
+#endif
/* file descriptor flags (F_GETFD, F_SETFD) */
#define FD_CLOEXEC 1 /* close-on-exec flag */
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
