X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fnetwork%2Fsocket.c;h=ba8d45b16403d991ffe2a6e3fa02d9440bc7b529;hp=afaeb411bab866ff4a9ceea00001c210d0e42c0a;hb=31a55f233b313030a787240b76c06f2d08cde29f;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01

diff --git a/src/network/socket.c b/src/network/socket.c
index afaeb411..ba8d45b1 100644
--- 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;
 }