From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id BD7CC382E744; Wed, 7 Dec 2022 19:15:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BD7CC382E744 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670440514; bh=FJHcsaSVX7BTBl6LjfiJ2YqV1SoePvZCH8PrROd06js=; h=From:To:Subject:Date:From; b=PcoNidJ5bpCIPEmVaFu6TTWyzdC3VOeKc2SSZG4tE1rlU1kCoXOdzkaSrpjt+I/Ln Wlv5jhPKWs5Xp34Nlaou+9UcrjCdMIg3yckv5C2zX1WWerPwojy16UHeMQj/9SrVWz +68erQTy2u1LrvBrMMaLZ3ZTJ+JHT81eYiugNK+Y= 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 link implementation X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella Netto X-Git-Refname: refs/heads/master X-Git-Oldrev: 25ca6175bacb40b9704458e53ddee58865d8ab2b X-Git-Newrev: f178e5173f737c33f421a7a994a3ab67a8a4eb86 Message-Id: <20221207191514.BD7CC382E744@sourceware.org> Date: Wed, 7 Dec 2022 19:15:14 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f178e5173f737c33f421a7a994a3ab67a8a4eb86 commit f178e5173f737c33f421a7a994a3ab67a8a4eb86 Author: Adhemerval Zanella Netto Date: Wed Oct 19 19:14:12 2022 -0300 Linux: consolidate link implementation Use link syscall if defined, otherwise use linkat. Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell Diff: --- sysdeps/unix/sysv/linux/{generic => }/link.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/generic/link.c b/sysdeps/unix/sysv/linux/link.c similarity index 78% rename from sysdeps/unix/sysv/linux/generic/link.c rename to sysdeps/unix/sysv/linux/link.c index e07655d521..eb4fe1569e 100644 --- a/sysdeps/unix/sysv/linux/generic/link.c +++ b/sysdeps/unix/sysv/linux/link.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2011-2022 Free Software Foundation, Inc. +/* Make a new name for a file. 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 @@ -23,7 +24,11 @@ int __link (const char *from, const char *to) { - return INLINE_SYSCALL (linkat, 5, AT_FDCWD, from, AT_FDCWD, to, 0); +#ifdef __NR_link + return INLINE_SYSCALL_CALL (link, from, to); +#else + return INLINE_SYSCALL_CALL (linkat, AT_FDCWD, from, AT_FDCWD, to, 0); +#endif } weak_alias (__link, link)