X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fnetwork%2Fsocket.c;h=ba8d45b16403d991ffe2a6e3fa02d9440bc7b529;hp=4f1e86dbf16f9d0e124137eb3623baa5057af281;hb=79a5e73e518213d5e77a06cfc0db74ffbf7922c6;hpb=3d8d90c5ccf66f1d243cb1b248b047295c197b5c

diff --git a/src/network/socket.c b/src/network/socket.c
index 4f1e86db..ba8d45b1 100644
--- a/src/network/socket.c
+++ b/src/network/socket.c
@@ -1,7 +1,20 @@
 #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 && (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;
 }