From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 574023889E1E; Wed, 7 Dec 2022 19:15:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 574023889E1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670440540; bh=zWWUbPDsVdUK5o+Cnta9jjicZeoiS9TNUPrfI0Mq74k=; h=From:To:Subject:Date:From; b=CAiIt597dbEiSuALyZb8wQ8Z7WwPKkBZ1wJq4t/NyNzdu1iXEwY8B1J7FoaQqQjdr lCjZt1bBohfo7BjzBT7R4WsdUHz0RjCuFvmBwErMFs3C7Iv1mKsdpzD8mxIB5zpJFt NxnpN3RsOKs724Vqx3x8KklzJwj0lgcvEXpm1rpo= 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 unlink implementation X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella Netto X-Git-Refname: refs/heads/master X-Git-Oldrev: bf58f34a708055361056907511c625449b7d27d6 X-Git-Newrev: 9cffb295e3af682bcc1c2629e808e3db8a4e2cbf Message-Id: <20221207191540.574023889E1E@sourceware.org> Date: Wed, 7 Dec 2022 19:15:40 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9cffb295e3af682bcc1c2629e808e3db8a4e2cbf commit 9cffb295e3af682bcc1c2629e808e3db8a4e2cbf Author: Adhemerval Zanella Netto Date: Wed Oct 19 19:14:17 2022 -0300 Linux: consolidate unlink implementation Use unlink syscall if defined, otherwise use unlinkat. Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell Diff: --- sysdeps/unix/sysv/linux/{generic => }/unlink.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/generic/unlink.c b/sysdeps/unix/sysv/linux/unlink.c similarity index 77% rename from sysdeps/unix/sysv/linux/generic/unlink.c rename to sysdeps/unix/sysv/linux/unlink.c index d2650acacc..e17b0a82d2 100644 --- a/sysdeps/unix/sysv/linux/generic/unlink.c +++ b/sysdeps/unix/sysv/linux/unlink.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2011-2022 Free Software Foundation, Inc. +/* Delete a name and possibly the file it refers to. 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,6 +24,10 @@ int __unlink (const char *name) { - return INLINE_SYSCALL (unlinkat, 3, AT_FDCWD, name, 0); +#ifdef __NR_unlink + return INLINE_SYSCALL_CALL (unlink, name); +#else + return INLINE_SYSCALL_CALL (unlinkat, AT_FDCWD, name, 0); +#endif } weak_alias (__unlink, unlink)