X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fstdio%2F__fdopen.c;h=a6ae73a2021306dfd461ef86592977c90f14cada;hb=df15168cf8baf34fb9c94e19eaa1a5c79c853970;hp=b13318e57a8798172f11411a997058ffd6909096;hpb=eb0e8fa0b1960cff4bd65ebefc798f70273b0bc9;p=oweals%2Fmusl.git diff --git a/src/stdio/__fdopen.c b/src/stdio/__fdopen.c index b13318e5..a6ae73a2 100644 --- a/src/stdio/__fdopen.c +++ b/src/stdio/__fdopen.c @@ -1,13 +1,21 @@ #include "stdio_impl.h" +#include +#include +#include +#include +#include +#include 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)) 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 +24,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); - __syscall(SYS_fcntl, fd, F_SETFL, flags | O_APPEND); + if (!(flags & O_APPEND)) + __syscall(SYS_fcntl, fd, F_SETFL, flags | O_APPEND); + f->flags |= F_APP; } f->fd = fd; @@ -39,11 +52,13 @@ FILE *__fdopen(int fd, const char *mode) f->seek = __stdio_seek; f->close = __stdio_close; + if (!libc.threaded) f->lock = -1; + /* Add new FILE to open file list */ OFLLOCK(); - f->next = ofl_head; - if (ofl_head) ofl_head->prev = f; - ofl_head = f; + f->next = libc.ofl_head; + if (libc.ofl_head) libc.ofl_head->prev = f; + libc.ofl_head = f; OFLUNLOCK(); return f;