From 7063c459e7dbd63c2c94e04413743abab5272001 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 22 Feb 2020 11:07:14 -0500 Subject: use __socketcall to simplify socket() commit 59324c8b0950ee94db846a50554183c845ede160 added __socketcall analogous to __syscall, returning the negated error rather than setting errno. use it to simplify the fallback path of socket(), avoiding extern calls and access to errno. Author: Rich Felker Date: Tue Jul 30 17:51:16 2019 -0400 make __socketcall analogous to __syscall, error-returning --- src/network/socket.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/network') diff --git a/src/network/socket.c b/src/network/socket.c index a2e92d90..afa1a7f3 100644 --- a/src/network/socket.c +++ b/src/network/socket.c @@ -5,17 +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 || errno==EPROTONOSUPPORT) + int s = __socketcall(socket, domain, type, protocol, 0, 0, 0); + if ((s==-EINVAL || s==-EPROTONOSUPPORT) && (type&(SOCK_CLOEXEC|SOCK_NONBLOCK))) { - s = socketcall(socket, domain, + 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) __syscall(SYS_fcntl, s, F_SETFD, FD_CLOEXEC); if (type & SOCK_NONBLOCK) __syscall(SYS_fcntl, s, F_SETFL, O_NONBLOCK); } - return s; + return __syscall_ret(s); } -- cgit v1.2.1