about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-09-29 18:09:34 -0400
committerRich Felker <dalias@aerifal.cx>2012-09-29 18:09:34 -0400
commit8582a6e9f25dd7b87d72961f58008052a4cac473 (patch)
treee9ba3b3d490bc26d6d61040a77bd1c7dabfda74e
parentf2d08cf7558176af7ef36cf5b5213e676b02d7ac (diff)
downloadmusl-8582a6e9f25dd7b87d72961f58008052a4cac473.tar.gz
musl-8582a6e9f25dd7b87d72961f58008052a4cac473.tar.xz
musl-8582a6e9f25dd7b87d72961f58008052a4cac473.zip
add 'e' modifier (close-on-exec) to fopen and fdopen
this feature will be in the next version of POSIX, and can be used
internally immediately. there are many internal uses of fopen where
close-on-exec is needed to fix bugs.
-rw-r--r--src/stdio/__fdopen.c6
-rw-r--r--src/stdio/fopen.c1
2 files changed, 5 insertions, 2 deletions
diff --git a/src/stdio/__fdopen.c b/src/stdio/__fdopen.c
index 8bd51c66..df6ed71d 100644
--- a/src/stdio/__fdopen.c
+++ b/src/stdio/__fdopen.c
@@ -4,7 +4,6 @@ FILE *__fdopen(int fd, const char *mode)
 {
 	FILE *f;
 	struct termios tio;
-	int plus = !!strchr(mode, '+');
 
 	/* Check for valid initial mode character */
 	if (!strchr("rwa", *mode)) {
@@ -19,7 +18,10 @@ FILE *__fdopen(int fd, const char *mode)
 	memset(f, 0, sizeof *f);
 
 	/* Impose mode restrictions */
-	if (!plus) f->flags = (*mode == 'r') ? F_NOWR : F_NORD;
+	if (!strchr(mode, '+')) f->flags = (*mode == 'r') ? F_NOWR : F_NORD;
+
+	/* Apply close-on-exec flag */
+	if (strchr(mode, 'e')) __syscall(SYS_fcntl, fd, F_SETFD, FD_CLOEXEC);
 
 	/* Set append mode on fd if opened for append */
 	if (*mode == 'a') {
diff --git a/src/stdio/fopen.c b/src/stdio/fopen.c
index 560b77e4..03c10cd1 100644
--- a/src/stdio/fopen.c
+++ b/src/stdio/fopen.c
@@ -17,6 +17,7 @@ FILE *fopen(const char *restrict filename, const char *restrict mode)
 	else if (*mode == 'r') flags = O_RDONLY;
 	else flags = O_WRONLY;
 	if (strchr(mode, 'x')) flags |= O_EXCL;
+	if (strchr(mode, 'e')) flags |= O_CLOEXEC;
 	if (*mode != 'r') flags |= O_CREAT;
 	if (*mode == 'w') flags |= O_TRUNC;
 	if (*mode == 'a') flags |= O_APPEND;