X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fstdio%2Ffopen.c;h=03c10cd16c9a3436906b3d25356395719d118e3a;hp=c2a350d119bf258fba48e5a88efaaa8ae33ee248;hb=f1b23d41cff432a8d0939af427fa005b4a4f95d7;hpb=aa398f56fa398f2202b04e82c67f822f3233786f

diff --git a/src/stdio/fopen.c b/src/stdio/fopen.c
index c2a350d1..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,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(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);
 	if (f) return f;
 
-	syscall(SYS_close, fd);
+	__syscall(SYS_close, fd);
 	return 0;
 }