X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fnetwork%2Fsocketpair.c;h=f3489621139a9d2deb5ee3f30eca76ecbec1fe4d;hb=d32dadd60efb9d3b255351a3b532f8e4c3dd0db1;hp=b15f8467c4f27b35a0496916fdd347345b2e01f9;hpb=03a2f3e48caec15b1a9cebccc85328e9b8169df0;p=musl

diff --git a/src/network/socketpair.c b/src/network/socketpair.c
index b15f8467..f3489621 100644
--- a/src/network/socketpair.c
+++ b/src/network/socketpair.c
@@ -1,7 +1,25 @@
 #include <sys/socket.h>
+#include <fcntl.h>
+#include <errno.h>
 #include "syscall.h"
 
 int socketpair(int domain, int type, int protocol, int fd[2])
 {
-	return socketcall(socketpair, domain, type, protocol, fd, 0, 0);
+	int r = socketcall(socketpair, domain, type, protocol, fd, 0, 0);
+	if (r<0 && (errno==EINVAL || errno==EPROTONOSUPPORT)
+	    && (type&(SOCK_CLOEXEC|SOCK_NONBLOCK))) {
+		r = socketcall(socketpair, domain,
+			type & ~(SOCK_CLOEXEC|SOCK_NONBLOCK),
+			protocol, fd, 0, 0);
+		if (r < 0) return r;
+		if (type & SOCK_CLOEXEC) {
+			__syscall(SYS_fcntl, fd[0], F_SETFD, FD_CLOEXEC);
+			__syscall(SYS_fcntl, fd[1], F_SETFD, FD_CLOEXEC);
+		}
+		if (type & SOCK_NONBLOCK) {
+			__syscall(SYS_fcntl, fd[0], F_SETFL, O_NONBLOCK);
+			__syscall(SYS_fcntl, fd[1], F_SETFL, O_NONBLOCK);
+		}
+	}
+	return r;
 }