X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2F__fdopen.c;h=8d6ce813e45ec8ed880e1680d38fb409b4f63000;hb=78897b0dc00b7cd5c29af5e0b7eebf2396d8dce0;hp=a01026741bb93d2b864a081210b30a50fe784580;hpb=69cf09c821b94668f03c942585d99c13121731c8;p=musl

diff --git a/src/stdio/__fdopen.c b/src/stdio/__fdopen.c
index a0102674..8d6ce813 100644
--- a/src/stdio/__fdopen.c
+++ b/src/stdio/__fdopen.c
@@ -1,13 +1,20 @@
 #include "stdio_impl.h"
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
 
 FILE *__fdopen(int fd, const char *mode)
 {
 	FILE *f;
-	struct termios tio;
-	int plus = !!strchr(mode, '+');
+	struct winsize wsz;
 
 	/* Check for valid initial mode character */
-	if (!strchr("rwa", *mode)) return 0;
+	if (!strchr("rwa", *mode)) {
+		errno = EINVAL;
+		return 0;
+	}
 
 	/* Allocate FILE+buffer or fail */
 	if (!(f=malloc(sizeof *f + UNGET + BUFSIZ))) return 0;
@@ -16,12 +23,17 @@ 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') {
-		int flags = syscall(SYS_fcntl, fd, F_GETFL, 0);
-		syscall(SYS_fcntl, fd, F_SETFL, flags | O_APPEND);
+		int flags = __syscall(SYS_fcntl, fd, F_GETFL);
+		if (!(flags & O_APPEND))
+			__syscall(SYS_fcntl, fd, F_SETFL, flags | O_APPEND);
+		f->flags |= F_APP;
 	}
 
 	f->fd = fd;
@@ -30,7 +42,7 @@ FILE *__fdopen(int fd, const char *mode)
 
 	/* Activate line buffered mode for terminals */
 	f->lbf = EOF;
-	if (!(f->flags & F_NOWR) && !__syscall(SYS_ioctl, fd, TCGETS, &tio))
+	if (!(f->flags & F_NOWR) && !__syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz))
 		f->lbf = '\n';
 
 	/* Initialize op ptrs. No problem if some are unneeded. */
@@ -39,14 +51,10 @@ FILE *__fdopen(int fd, const char *mode)
 	f->seek = __stdio_seek;
 	f->close = __stdio_close;
 
-	/* Add new FILE to open file list */
-	OFLLOCK();
-	f->next = ofl_head;
-	if (ofl_head) ofl_head->prev = f;
-	ofl_head = f;
-	OFLUNLOCK();
+	if (!libc.threaded) f->lock = -1;
 
-	return f;
+	/* Add new FILE to open file list */
+	return __ofl_add(f);
 }
 
 weak_alias(__fdopen, fdopen);