Author: jilles
Date: Sun Oct 27 21:49:52 2013
New Revision: 257229
URL: http://svnweb.freebsd.org/changeset/base/257229
Log:
MFC r243731,r255303: libc: Allow setting close-on-exec in fopen/freopen/
fdopen.
This commit adds a new mode option 'e'.
For freopen() with a non-NULL path argument and fopen(), the close-on-exec
flag is set iff the 'e' mode option is specified. For freopen() with a NULL
path argument and fdopen(), the close-on-exec flag is turned on if the 'e'
mode option is specified and remains unchanged otherwise.
Although the same behaviour for fopen() can be obtained by open(O_CLOEXEC)
and fdopen(), this needlessly complicates the calling code.
PR: kern/169320
Added:
stable/9/tools/regression/lib/libc/stdio/test-fopen.c
- copied unchanged from r255303,
head/tools/regression/lib/libc/stdio/test-fopen.c
stable/9/tools/regression/lib/libc/stdio/test-fopen.t
- copied unchanged from r255303,
head/tools/regression/lib/libc/stdio/test-fopen.t
Modified:
stable/9/lib/libc/stdio/fdopen.c
stable/9/lib/libc/stdio/flags.c
stable/9/lib/libc/stdio/fopen.3
stable/9/lib/libc/stdio/freopen.c
Directory Properties:
stable/9/lib/libc/ (props changed)
stable/9/tools/regression/lib/libc/ (props changed)
Modified: stable/9/lib/libc/stdio/fdopen.c
==============================================================================
--- stable/9/lib/libc/stdio/fdopen.c Sun Oct 27 21:39:16 2013
(r257228)
+++ stable/9/lib/libc/stdio/fdopen.c Sun Oct 27 21:49:52 2013
(r257229)
@@ -80,6 +80,12 @@ fdopen(fd, mode)
if ((fp = __sfp()) == NULL)
return (NULL);
+
+ if ((oflags & O_CLOEXEC) && _fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) {
+ fp->_flags = 0;
+ return (NULL);
+ }
+
fp->_flags = flags;
/*
* If opened for appending, but underlying descriptor does not have
Modified: stable/9/lib/libc/stdio/flags.c
==============================================================================
--- stable/9/lib/libc/stdio/flags.c Sun Oct 27 21:39:16 2013
(r257228)
+++ stable/9/lib/libc/stdio/flags.c Sun Oct 27 21:49:52 2013
(r257229)
@@ -53,7 +53,7 @@ __sflags(mode, optr)
const char *mode;
int *optr;
{
- int ret, m, o;
+ int ret, m, o, known;
switch (*mode++) {
@@ -80,28 +80,34 @@ __sflags(mode, optr)
return (0);
}
- /* 'b' (binary) is ignored */
- if (*mode == 'b')
- mode++;
-
- /* [rwa][b]\+ means read and write */
- if (*mode == '+') {
- mode++;
- ret = __SRW;
- m = O_RDWR;
- }
-
- /* 'b' (binary) can appear here, too -- and is ignored again */
- if (*mode == 'b')
- mode++;
-
- /* 'x' means exclusive (fail if the file exists) */
- if (*mode == 'x') {
- if (m == O_RDONLY) {
- errno = EINVAL;
- return (0);
+ do {
+ known = 1;
+ switch (*mode++) {
+ case 'b':
+ /* 'b' (binary) is ignored */
+ break;
+ case '+':
+ /* [rwa][b]\+ means read and write */
+ ret = __SRW;
+ m = O_RDWR;
+ break;
+ case 'x':
+ /* 'x' means exclusive (fail if the file exists) */
+ o |= O_EXCL;
+ break;
+ case 'e':
+ /* set close-on-exec */
+ o |= O_CLOEXEC;
+ break;
+ default:
+ known = 0;
+ break;
}
- o |= O_EXCL;
+ } while (known);
+
+ if ((o & O_EXCL) != 0 && m == O_RDONLY) {
+ errno = EINVAL;
+ return (0);
}
*optr = m | o;
Modified: stable/9/lib/libc/stdio/fopen.3
==============================================================================
--- stable/9/lib/libc/stdio/fopen.3 Sun Oct 27 21:39:16 2013
(r257228)
+++ stable/9/lib/libc/stdio/fopen.3 Sun Oct 27 21:49:52 2013
(r257229)
@@ -100,6 +100,14 @@ or
causes the
.Fn fopen
call to fail if the file already exists.
+An optional
+.Dq Li e
+following the above
+causes the
+.Fn fopen
+call to set the
+.Dv FD_CLOEXEC
+flag on the underlying file descriptor.
.Pp
The
.Fa mode
@@ -149,6 +157,11 @@ of the stream must be compatible with th
The
.Dq Li x
mode option is ignored.
+If the
+.Dq Li e
+mode option is present, the
+.Dv FD_CLOEXEC
+flag is set, otherwise it remains unchanged.
When the stream is closed via
.Xr fclose 3 ,
.Fa fildes
@@ -313,6 +326,10 @@ function
conforms to
.St -p1003.1-88 .
The
+.Dq Li e
+mode option does not conform to any standard
+but is also supported by glibc.
+The
.Fn fmemopen
function
conforms to
Modified: stable/9/lib/libc/stdio/freopen.c
==============================================================================
--- stable/9/lib/libc/stdio/freopen.c Sun Oct 27 21:39:16 2013
(r257228)
+++ stable/9/lib/libc/stdio/freopen.c Sun Oct 27 21:49:52 2013
(r257229)
@@ -118,6 +118,8 @@ freopen(file, mode, fp)
(void) ftruncate(fp->_file, (off_t)0);
if (!(oflags & O_APPEND))
(void) _sseek(fp, (fpos_t)0, SEEK_SET);
+ if (oflags & O_CLOEXEC)
+ (void) _fcntl(fp->_file, F_SETFD, FD_CLOEXEC);
f = fp->_file;
isopen = 0;
wantfd = -1;
@@ -194,7 +196,8 @@ finish:
* assume stderr is always fd STDERR_FILENO, even if being freopen'd.
*/
if (wantfd >= 0) {
- if (_dup2(f, wantfd) >= 0) {
+ if ((oflags & O_CLOEXEC ? _fcntl(f, F_DUP2FD_CLOEXEC, wantfd) :
+ _dup2(f, wantfd)) >= 0) {
(void)_close(f);
f = wantfd;
} else
Copied: stable/9/tools/regression/lib/libc/stdio/test-fopen.c (from r255303,
head/tools/regression/lib/libc/stdio/test-fopen.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/regression/lib/libc/stdio/test-fopen.c Sun Oct 27
21:49:52 2013 (r257229, copy of r255303,
head/tools/regression/lib/libc/stdio/test-fopen.c)
@@ -0,0 +1,113 @@
+/*-
+ * Copyright (c) 2013 Jilles Tjoelker
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+/*
+ * O_ACCMODE is currently defined incorrectly. This is what it should be.
+ * Various code depends on the incorrect value.
+ */
+#define CORRECT_O_ACCMODE (O_ACCMODE | O_EXEC)
+
+static int testnum = 1;
+
+static void
+runtest(const char *fname, const char *mode)
+{
+ FILE *fp;
+ int fd, flags, wantedflags;
+
+ fp = fopen(fname, mode);
+ if (fp == NULL) {
+ printf("not ok %d - fopen(\"%s\", \"%s\") failed\n",
+ testnum++, fname, mode);
+ printf("not ok %d - FD_CLOEXEC # SKIP\n",
+ testnum++);
+ return;
+ }
+ fd = fileno(fp);
+ if (fd < 0)
+ printf("not ok %d - fileno() failed\n", testnum++);
+ else
+ printf("ok %d - fopen(\"%s\", \"%s\") and fileno() succeeded\n",
+ testnum++, fname, mode);
+ if (fcntl(fd, F_GETFD) == (strchr(mode, 'e') != NULL ? FD_CLOEXEC : 0))
+ printf("ok %d - FD_CLOEXEC flag correct\n", testnum++);
+ else
+ printf("not ok %d - FD_CLOEXEC flag incorrect\n", testnum++);
+ flags = fcntl(fd, F_GETFL);
+ if (strchr(mode, '+'))
+ wantedflags = O_RDWR | (*mode == 'a' ? O_APPEND : 0);
+ else if (*mode == 'r')
+ wantedflags = O_RDONLY;
+ else if (*mode == 'w')
+ wantedflags = O_WRONLY;
+ else if (*mode == 'a')
+ wantedflags = O_WRONLY | O_APPEND;
+ else
+ wantedflags = -1;
+ if (wantedflags == -1)
+ printf("not ok %d - unrecognized mode\n", testnum++);
+ else if ((flags & (CORRECT_O_ACCMODE | O_APPEND)) == wantedflags)
+ printf("ok %d - correct access mode\n", testnum++);
+ else
+ printf("not ok %d - incorrect access mode\n", testnum++);
+ fclose(fp);
+}
+
+/*
+ * Test program for fopen().
+ */
+int
+main(int argc, char *argv[])
+{
+ printf("1..45\n");
+ runtest("/dev/null", "r");
+ runtest("/dev/null", "r+");
+ runtest("/dev/null", "w");
+ runtest("/dev/null", "w+");
+ runtest("/dev/null", "a");
+ runtest("/dev/null", "a+");
+ runtest("/dev/null", "re");
+ runtest("/dev/null", "r+e");
+ runtest("/dev/null", "we");
+ runtest("/dev/null", "w+e");
+ runtest("/dev/null", "ae");
+ runtest("/dev/null", "a+e");
+ runtest("/dev/null", "re+");
+ runtest("/dev/null", "we+");
+ runtest("/dev/null", "ae+");
+
+ return 0;
+}
+
+/* vim:ts=8:cin:sw=8
+ * */
Copied: stable/9/tools/regression/lib/libc/stdio/test-fopen.t (from r255303,
head/tools/regression/lib/libc/stdio/test-fopen.t)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/regression/lib/libc/stdio/test-fopen.t Sun Oct 27
21:49:52 2013 (r257229, copy of r255303,
head/tools/regression/lib/libc/stdio/test-fopen.t)
@@ -0,0 +1,10 @@
+#!/bin/sh
+# $FreeBSD$
+
+cd `dirname $0`
+
+executable=`basename $0 .t`
+
+make $executable 2>&1 > /dev/null
+
+exec ./$executable
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
