X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2Ffopen.c;h=03c10cd16c9a3436906b3d25356395719d118e3a;hb=858df113bfac4d2ebb60c3fac1538e07d56096b0;hp=469de6f0b62a6bf9d494859f186797a8103aa74e;hpb=eb0e8fa0b1960cff4bd65ebefc798f70273b0bc9;p=musl diff --git a/src/stdio/fopen.c b/src/stdio/fopen.c index 469de6f0..03c10cd1 100644 --- 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,14 +13,16 @@ 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(SYS_open, filename, flags|O_LARGEFILE, 0666); + fd = syscall_cp(SYS_open, filename, flags|O_LARGEFILE, 0666); if (fd < 0) return 0; f = __fdopen(fd, mode);