[PATCH 14/30] Linux: consolidate unlink implementation

Adhemerval Zanella adhemerval.zanella@linaro.org
Wed Oct 19 22:14:17 GMT 2022


Use unlink syscall if defined, otherwise use unlinkat.

Checked on x86_64-linux-gnu.
---
 sysdeps/unix/sysv/linux/{generic => }/unlink.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
 rename sysdeps/unix/sysv/linux/{generic => }/unlink.c (77%)

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)
-- 
2.34.1



More information about the Libc-alpha mailing list