getservbyport_r: fix wrong result if getnameinfo fails with EAI_OVERFLOW

[musl] / src / fcntl / open.c

diff --git a/src/fcntl/open.c b/src/fcntl/open.c
index 4c1a591..4c3c827 100644 (file)
--- a/src/fcntl/open.c
+++ b/src/fcntl/open.c
@@ -1,21 +1,21 @@
 #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);
+       }
 
-LFS64(open);
+       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);
+}