elf.h: add ELFCOMPRESS_ZSTD

[musl] / src / network / socket.c

diff --git a/src/network/socket.c b/src/network/socket.c
index ba8d45b..afa1a7f 100644 (file)
--- a/src/network/socket.c
+++ b/src/network/socket.c
@@ -5,16 +5,17 @@
 
 int socket(int domain, int type, int protocol)
 {
-       int s = socketcall(socket, domain, type, protocol, 0, 0, 0);
-       if (s<0 && errno==EINVAL && (type&(SOCK_CLOEXEC|SOCK_NONBLOCK))) {
-               s = socketcall(socket, domain,
+       int s = __socketcall(socket, domain, type, protocol, 0, 0, 0);
+       if ((s==-EINVAL || s==-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 (s < 0) return __syscall_ret(s);
                if (type & SOCK_CLOEXEC)
-                       fcntl(s, F_SETFD, FD_CLOEXEC);
+                       __syscall(SYS_fcntl, s, F_SETFD, FD_CLOEXEC);
                if (type & SOCK_NONBLOCK)
-                       fcntl(s, F_SETFL, fcntl(s, F_GETFL) | O_NONBLOCK);
+                       __syscall(SYS_fcntl, s, F_SETFL, O_NONBLOCK);
        }
-       return s;
+       return __syscall_ret(s);
 }