diff mbox series

[05/30] Linux: consolidate dup2 implementation

Message ID	20221019221433.1082017-6-adhemerval.zanella@linaro.org
State	Committed
Commit	33ef940302eba1ecf9e98376557af75d7d9c0ed1
Headers	DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 73FE03858291 To: libc-alpha@sourceware.org Subject: [PATCH 05/30] Linux: consolidate dup2 implementation Date: Wed, 19 Oct 2022 19:14:08 -0300 Message-Id: <20221019221433.1082017-6-adhemerval.zanella@linaro.org> In-Reply-To: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> References: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list From: Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org> Reply-To: Adhemerval Zanella <adhemerval.zanella@linaro.org> Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces+patchwork=sourceware.org@sourceware.org>
Series	Remove Linux generic sysdep \| [00/30] Remove Linux generic sysdep [01/30] linux: Fix generic struct_stat for 64 bit time (BZ# 29657) [02/30] linux: Consolidate dl-origin.c [03/30] Linux: consolidate chmod implementation [04/30] Linux: consolidate chown implementation [05/30] Linux: consolidate dup2 implementation [06/30] Lninux: consolidate epoll_create implementation [07/30] Linux: consolidate inotify_init implementation [08/30] Linux: consolidate lchown implementation [09/30] Linux: consolidate link implementation [10/30] Linux: consolidate mkdir implementation [11/30] Linux: consolidate readlink implementation [12/30] Linux: consolidate rmdir implementation [13/30] Linux: consolidate symlink implementation [14/30] Linux: consolidate unlink implementation [15/30] Linux: consolidate sendfile implementation [16/30] Linux: Move wordsize-32 Version to default [17/30] Linux: consolidate ____longjmp_chk [18/30] Linux: Assume and consolidate bind wire-up syscall [19/30] Linux: Assume iand consolidate socket wire-up syscall [20/30] Linux: Assume and consolidate socketpair wire-up syscall [21/30] Linux: Assume and consolidate listen wire-up syscall [22/30] Linux: Assume and consolidate getsockname wire-up syscall [23/30] Linux: Assume and consolidate getpeername wire-up syscall [24/30] Linux: Assume and consolidate shutdown wire-up syscall [25/30] Linux: Remove unused generic Makefile [26/30] Linux: Remove generic sysdep [27/30] Linux: make generic xstatver.h the default one [28/30] Linux: Make generic fcntl.h the default one [29/30] Linux: Consolidate typesizes.h [30/30] Linux: Remove generic Implies

Checks

Context	Check	Description
dj/TryBot-apply_patch	success	Patch applied to master at the time it was sent

Commit Message

Adhemerval Zanella Oct. 19, 2022, 10:14 p.m. UTC

  Use dup2 syscall if defined, otherwise use dup3.

Checked on x86_64-linux-gnu.
---
 sysdeps/unix/sysv/linux/{generic => }/dup2.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
 rename sysdeps/unix/sysv/linux/{generic => }/dup2.c (83%)

Comments

Carlos O'Donell Dec. 5, 2022, 4:40 p.m. UTC | #1

On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote:
> Use dup2 syscall if defined, otherwise use dup3.
> 
> Checked on x86_64-linux-gnu.

LGTM.

No regressions on x86_64 and i686.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>

> ---
>  sysdeps/unix/sysv/linux/{generic => }/dup2.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>  rename sysdeps/unix/sysv/linux/{generic => }/dup2.c (83%)
> 
> diff --git a/sysdeps/unix/sysv/linux/generic/dup2.c b/sysdeps/unix/sysv/linux/dup2.c
> similarity index 83%
> rename from sysdeps/unix/sysv/linux/generic/dup2.c
> rename to sysdeps/unix/sysv/linux/dup2.c
> index 0dc45e9b17..1182780e15 100644
> --- a/sysdeps/unix/sysv/linux/generic/dup2.c
> +++ b/sysdeps/unix/sysv/linux/dup2.c
> @@ -1,4 +1,5 @@
> -/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
> +/* Duplicate a file descriptor.  Linux version.
> +   Copyright (C) 2011-2022 Free Software Foundation, Inc.
>     This file is part of the GNU C Library.
>  
>     The GNU C Library is free software; you can redistribute it and/or
> @@ -24,12 +25,16 @@
>  int
>  __dup2 (int fd, int fd2)
>  {
> +#ifdef __NR_dup2
> +  return INLINE_SYSCALL_CALL (dup2, fd, fd2);

OK.

> +#else
>    /* For the degenerate case, check if the fd is valid (by trying to
>       get the file status flags) and return it, or else return EBADF.  */
>    if (fd == fd2)
>      return __libc_fcntl (fd, F_GETFL, 0) < 0 ? -1 : fd;
>  
> -  return INLINE_SYSCALL (dup3, 3, fd, fd2, 0);
> +  return INLINE_SYSCALL_CALL (dup3, fd, fd2, 0);

OK.

> +#endif
>  }
>  libc_hidden_def (__dup2)
>  weak_alias (__dup2, dup2)

diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/generic/dup2.c b/sysdeps/unix/sysv/linux/dup2.c
similarity index 83%
rename from sysdeps/unix/sysv/linux/generic/dup2.c
rename to sysdeps/unix/sysv/linux/dup2.c
index 0dc45e9b17..1182780e15 100644
--- a/sysdeps/unix/sysv/linux/generic/dup2.c
+++ b/sysdeps/unix/sysv/linux/dup2.c
@@ -1,4 +1,5 @@ 
-/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
+/* Duplicate a file descriptor.  Linux version.
+   Copyright (C) 2011-2022 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -24,12 +25,16 @@ 
 int
 __dup2 (int fd, int fd2)
 {
+#ifdef __NR_dup2
+  return INLINE_SYSCALL_CALL (dup2, fd, fd2);
+#else
   /* For the degenerate case, check if the fd is valid (by trying to
      get the file status flags) and return it, or else return EBADF.  */
   if (fd == fd2)
     return __libc_fcntl (fd, F_GETFL, 0) < 0 ? -1 : fd;
 
-  return INLINE_SYSCALL (dup3, 3, fd, fd2, 0);
+  return INLINE_SYSCALL_CALL (dup3, fd, fd2, 0);
+#endif
 }
 libc_hidden_def (__dup2)
 weak_alias (__dup2, dup2)