as an extension, have putenv("VAR") behave as unsetenv("VAR")

[musl] / src / network / socket.c

diff --git a/src/network/socket.c b/src/network/socket.c
index afaeb41..ba8d45b 100644 (file)
--- a/src/network/socket.c
+++ b/src/network/socket.c
@@ -1,9 +1,20 @@
 #include <sys/socket.h>
+#include <fcntl.h>
+#include <errno.h>
 #include "syscall.h"
-#include "socketcall.h"
 
 int socket(int domain, int type, int protocol)
 {
-       unsigned long args[] = { domain, type, protocol };
-       return syscall2(__NR_socketcall, SYS_SOCKET, (long)args);
+       int s = socketcall(socket, domain, type, protocol, 0, 0, 0);
+       if (s<0 && errno==EINVAL && (type&(SOCK_CLOEXEC|SOCK_NONBLOCK))) {
+               s = socketcall(socket, domain,
+                       type & ~(SOCK_CLOEXEC|SOCK_NONBLOCK),
+                       protocol, 0, 0, 0);
+               if (s < 0) return s;
+               if (type & SOCK_CLOEXEC)
+                       fcntl(s, F_SETFD, FD_CLOEXEC);
+               if (type & SOCK_NONBLOCK)
+                       fcntl(s, F_SETFL, fcntl(s, F_GETFL) | O_NONBLOCK);
+       }
+       return s;
 }