X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fnetwork%2Fsocket.c;h=51be30eed72887d47e489a970ce7cd8e71c73ca6;hb=faea4c9937d36b17e53fdc7d5a254d7e936e1755;hp=4f1e86dbf16f9d0e124137eb3623baa5057af281;hpb=03a2f3e48caec15b1a9cebccc85328e9b8169df0;p=musl

diff --git a/src/network/socket.c b/src/network/socket.c
index 4f1e86db..51be30ee 100644
--- a/src/network/socket.c
+++ b/src/network/socket.c
@@ -1,7 +1,21 @@
 #include <sys/socket.h>
+#include <fcntl.h>
+#include <errno.h>
 #include "syscall.h"
 
 int socket(int domain, int type, int protocol)
 {
-	return socketcall(socket, domain, type, protocol, 0, 0, 0);
+	int s = socketcall(socket, domain, type, protocol, 0, 0, 0);
+	if (s<0 && (errno==EINVAL || errno==EPROTONOSUPPORT)
+	    && (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;
 }