X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffcntl%2Fopen.c;h=1d817a2d6c485b24571ffb422fba520705932517;hb=5db475f0b987bfa7935a117aac81e14a98de34fb;hp=4c1a591d3f029e4f3a1db48822fddac9fac8d817;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/fcntl/open.c b/src/fcntl/open.c
index 4c1a591d..1d817a2d 100644
--- a/src/fcntl/open.c
+++ b/src/fcntl/open.c
@@ -1,21 +1,23 @@
 #include <fcntl.h>
-#include <unistd.h>
 #include <stdarg.h>
 #include "syscall.h"
-#include "libc.h"
 
 int open(const char *filename, int flags, ...)
 {
-	int r;
-	mode_t mode;
-	va_list ap;
-	va_start(ap, flags);
-	mode = va_arg(ap, mode_t);
-	va_end(ap);
-	CANCELPT_BEGIN;
-	r = __syscall_open(filename, flags, mode);
-	CANCELPT_END;
-	return r;
+	mode_t mode = 0;
+
+	if ((flags & O_CREAT) || (flags & O_TMPFILE) == O_TMPFILE) {
+		va_list ap;
+		va_start(ap, flags);
+		mode = va_arg(ap, mode_t);
+		va_end(ap);
+	}
+
+	int fd = __sys_open_cp(filename, flags, mode);
+	if (fd>=0 && (flags & O_CLOEXEC))
+		__syscall(SYS_fcntl, fd, F_SETFD, FD_CLOEXEC);
+
+	return __syscall_ret(fd);
 }
 
-LFS64(open);
+weak_alias(open, open64);