From: Adhemerval Zanella Netto Date: Wed, 19 Oct 2022 22:14:17 +0000 (-0300) Subject: Linux: consolidate unlink implementation X-Git-Tag: glibc-2.37~106 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cffb295e3af682bcc1c2629e808e3db8a4e2cbf;p=thirdparty%2Fglibc.git 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 --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 d2650acacc0..e17b0a82d2a 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)