From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 4D86D390CEAE; Wed, 7 Dec 2022 19:14:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4D86D390CEAE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670440494; bh=OZVZZFgRTgvI46a8wH9Qrm7nGv5t0PJqwK5jj5bLdm0=; h=From:To:Subject:Date:From; b=QZge83WdDphWgr7WVZirz1e/d/nNIFzEFAyaPyRK6m+d9/x2hjAKyAo4qcDMLPMok iu38bwpvAvmEu09BO917H0QZ0DU7rac6hQ9fEo3u/dbGzqftmyh2y+zeMKtmEsyyaI SQ+OFSnNSvyY3wkBG+IrCE4JuXne6uc1g9bmN35s= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] Linux: consolidate dup2 implementation X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella Netto X-Git-Refname: refs/heads/master X-Git-Oldrev: 1001abfa14d5289236dcca740ab72ec4d1fa5352 X-Git-Newrev: 33ef940302eba1ecf9e98376557af75d7d9c0ed1 Message-Id: <20221207191454.4D86D390CEAE@sourceware.org> Date: Wed, 7 Dec 2022 19:14:54 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=33ef940302eba1ecf9e98376557af75d7d9c0ed1 commit 33ef940302eba1ecf9e98376557af75d7d9c0ed1 Author: Adhemerval Zanella Netto Date: Wed Oct 19 19:14:08 2022 -0300 Linux: consolidate dup2 implementation Use dup2 syscall if defined, otherwise use dup3. Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell Diff: --- sysdeps/unix/sysv/linux/{generic => }/dup2.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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)