fix copy/paste error in popen changes that broke signals

[musl] / src / stdio / fopen.c

diff --git a/src/stdio/fopen.c b/src/stdio/fopen.c
index 670cf5f..03c10cd 100644 (file)
--- a/src/stdio/fopen.c
+++ b/src/stdio/fopen.c
@@ -1,11 +1,10 @@
 #include "stdio_impl.h"
 
-FILE *fopen(const char *filename, const char *mode)
+FILE *fopen(const char *restrict filename, const char *restrict mode)
 {
        FILE *f;
        int fd;
        int flags;
-       int plus = !!strchr(mode, '+');
 
        /* Check for valid initial mode character */
        if (!strchr("rwa", *mode)) {
@@ -14,20 +13,22 @@ FILE *fopen(const char *filename, const char *mode)
        }
 
        /* Compute the flags to pass to open() */
-       if (plus) flags = O_RDWR;
+       if (strchr(mode, '+')) flags = O_RDWR;
        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;
 
-       fd = __syscall_open(filename, flags, 0666);
+       fd = syscall_cp(SYS_open, filename, flags|O_LARGEFILE, 0666);
        if (fd < 0) return 0;
 
        f = __fdopen(fd, mode);
        if (f) return f;
 
-       __syscall_close(fd);
+       __syscall(SYS_close, fd);
        return 0;
 }