about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdhemerval Zanella Netto <adhemerval.zanella@linaro.org>2022-10-19 19:14:17 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-12-07 11:27:01 -0300
commit9cffb295e3af682bcc1c2629e808e3db8a4e2cbf (patch)
tree84185c745074efba1c45bb10d797f8894a4e9593
parentbf58f34a708055361056907511c625449b7d27d6 (diff)
downloadglibc-9cffb295e3af682bcc1c2629e808e3db8a4e2cbf.tar.gz
glibc-9cffb295e3af682bcc1c2629e808e3db8a4e2cbf.tar.xz
glibc-9cffb295e3af682bcc1c2629e808e3db8a4e2cbf.zip
Linux: consolidate unlink implementation
Use unlink syscall if defined, otherwise use unlinkat.

Checked on x86_64-linux-gnu.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
-rw-r--r--sysdeps/unix/sysv/linux/unlink.c (renamed from sysdeps/unix/sysv/linux/generic/unlink.c)9
1 files changed, 7 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/generic/unlink.c b/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)