diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/accept4.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/accept4.c | 70 |
1 files changed, 5 insertions, 65 deletions
diff --git a/sysdeps/unix/sysv/linux/accept4.c b/sysdeps/unix/sysv/linux/accept4.c index 1139e41cc7..8317c6843f 100644 --- a/sysdeps/unix/sysv/linux/accept4.c +++ b/sysdeps/unix/sysv/linux/accept4.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2016 Free Software Foundation, Inc. +/* Copyright (C) 2008-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2008. @@ -22,75 +22,15 @@ #include <sysdep-cancel.h> #include <sys/syscall.h> +#include <socketcall.h> #include <kernel-features.h> -/* Do not use the accept4 syscall on socketcall architectures unless - it was added at the same time as the socketcall support or can be - assumed to be present. */ -#if defined __ASSUME_SOCKETCALL \ - && !defined __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL \ - && !defined __ASSUME_ACCEPT4_SYSCALL -# undef __NR_accept4 -#endif - -#ifdef __NR_accept4 int accept4 (int fd, __SOCKADDR_ARG addr, socklen_t *addr_len, int flags) { +#ifdef __ASSUME_ACCEPT4_SYSCALL return SYSCALL_CANCEL (accept4, fd, addr.__sockaddr__, addr_len, flags); -} -#elif defined __NR_socketcall -# include <socketcall.h> -# ifdef __ASSUME_ACCEPT4_SOCKETCALL -int -accept4 (int fd, __SOCKADDR_ARG addr, socklen_t *addr_len, int flags) -{ +#else return SOCKETCALL_CANCEL (accept4, fd, addr.__sockaddr__, addr_len, flags); -} -# else -static int have_accept4; - -int -accept4 (int fd, __SOCKADDR_ARG addr, socklen_t *addr_len, int flags) -{ - if (__glibc_likely (have_accept4 >= 0)) - { - int ret = SOCKETCALL_CANCEL (accept4, fd, addr.__sockaddr__, addr_len, - flags); - /* The kernel returns -EINVAL for unknown socket operations. - We need to convert that error to an ENOSYS error. */ - if (__builtin_expect (ret < 0, 0) - && have_accept4 == 0 - && errno == EINVAL) - { - /* Try another call, this time with the FLAGS parameter - cleared and an invalid file descriptor. This call will not - cause any harm and it will return immediately. */ - ret = SOCKETCALL_CANCEL (invalid, -1); - if (errno == EINVAL) - { - have_accept4 = -1; - __set_errno (ENOSYS); - } - else - { - have_accept4 = 1; - __set_errno (EINVAL); - } - return -1; - } - return ret; - } - __set_errno (ENOSYS); - return -1; -} -# endif /* __ASSUME_ACCEPT4_SOCKETCALL */ -#else /* __NR_socketcall */ -int -accept4 (int fd, __SOCKADDR_ARG addr, socklen_t *addr_len, int flags) -{ - __set_errno (ENOSYS); - return -1; -} -stub_warning (accept4) #endif +} |