summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2017-11-02 02:40:43 +0100
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2017-11-02 03:14:17 +0100
commitc7e82668bd23fbdd02ebe1e83ff2bb6877812423 (patch)
tree8c2fac1a085f3f59675c57e6734c80221e1a56d8 /libc
parent3e880faa4f76eb7aa61893f5de73fb0bb9b6a4ab (diff)
convert accept4() to use cancel.h macros
Diffstat (limited to 'libc')
-rw-r--r--libc/inet/socketcalls.c37
1 files changed, 9 insertions, 28 deletions
diff --git a/libc/inet/socketcalls.c b/libc/inet/socketcalls.c
index e33d69344..1b92609d0 100644
--- a/libc/inet/socketcalls.c
+++ b/libc/inet/socketcalls.c
@@ -76,43 +76,24 @@ lt_libc_hidden(accept)
#endif
#ifdef L_accept4
-#ifdef __NR_accept4
-# define __NR___sys_accept4 __NR_accept4
-static _syscall4(int, __sys_accept4, int, fd, struct sockaddr *, addr, socklen_t *, addrlen, int, flags)
-int accept4(int fd, struct sockaddr *addr, socklen_t * addrlen, int flags)
-{
- if (SINGLE_THREAD_P)
- return __sys_accept4(fd, addr, addrlen, flags);
-#ifdef __UCLIBC_HAS_THREADS_NATIVE__
- else {
- int oldtype = LIBC_CANCEL_ASYNC ();
- int result = __sys_accept4(fd, addr, addrlen, flags);
- LIBC_CANCEL_RESET (oldtype);
- return result;
- }
-#endif
-}
-#elif defined(__NR_socketcall)
-int accept4(int fd, struct sockaddr *addr, socklen_t *addrlen, int flags)
+static int __NC(accept4)(int fd, struct sockaddr *addr, socklen_t *addrlen, int flags)
{
+# ifdef __NR_accept4
+ return INLINE_SYSCALL(accept4, 4, fd, addr, addrlen, flags);
+# elif defined(__NR_socketcall)
unsigned long args[4];
args[0] = fd;
args[1] = (unsigned long) addr;
args[2] = (unsigned long) addrlen;
args[3] = flags;
- if (SINGLE_THREAD_P)
- return __socketcall(SYS_ACCEPT4, args);
-#ifdef __UCLIBC_HAS_THREADS_NATIVE__
- else {
- int oldtype = LIBC_CANCEL_ASYNC ();
- int result = __socketcall(SYS_ACCEPT4, args);
- LIBC_CANCEL_RESET (oldtype);
- return result;
- }
+
+ return __socketcall(SYS_ACCEPT4, args);
#endif
}
-#endif
+CANCELLABLE_SYSCALL(int, accept4, (int fd, struct sockaddr *addr, socklen_t *addrlen, int flags),
+ (fd, addr, addrlen, flags))
+lt_libc_hidden(accept4)
#endif
#ifdef L_bind