niansa-misc/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-03-06 20:48:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

use __socketcall to simplify socket()

Browse source 
commit 59324c8b09 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 <dalias@aerifal.cx>
Date:   Tue Jul 30 17:51:16 2019 -0400

    make __socketcall analogous to __syscall, error-returning
This commit is contained in:
Rich Felker 2020-02-22 11:07:14 -05:00
parent a01f1fe66f
commit 7063c459e7
1 changed files with 5 additions and 5 deletions

10
src/network/socket.c
View file

@ -5,17 +5,17 @@
int socket(int domain, int type, int protocol) int socket(int domain, int type, int protocol)
{ {
int s = 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) if ((s==-EINVAL || s==-EPROTONOSUPPORT)
&& (type&(SOCK_CLOEXEC|SOCK_NONBLOCK))) { && (type&(SOCK_CLOEXEC|SOCK_NONBLOCK))) {
s = socketcall(socket, domain, s = __socketcall(socket, domain,
type & ~(SOCK_CLOEXEC|SOCK_NONBLOCK), type & ~(SOCK_CLOEXEC|SOCK_NONBLOCK),
protocol, 0, 0, 0); protocol, 0, 0, 0);
if (s < 0) return s; if (s < 0) return __syscall_ret(s);
if (type & SOCK_CLOEXEC) if (type & SOCK_CLOEXEC)
__syscall(SYS_fcntl, s, F_SETFD, FD_CLOEXEC); __syscall(SYS_fcntl, s, F_SETFD, FD_CLOEXEC);
if (type & SOCK_NONBLOCK) if (type & SOCK_NONBLOCK)
__syscall(SYS_fcntl, s, F_SETFL, O_NONBLOCK); __syscall(SYS_fcntl, s, F_SETFL, O_NONBLOCK);
} }
return s; return __syscall_ret(s);
} }