about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdhemerval Zanella Netto <adhemerval.zanella@linaro.org>2022-10-19 19:14:15 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-12-07 11:27:01 -0300
commit54ed77914a7718f5847aa193dcc5234675b6ef7b (patch)
tree3cce2e1098c19ea0eab5078c4fc56bd0e2ab8f27
parent2fc81f6ca56f1df5323fc849f3f8dc40f38fc5b2 (diff)
downloadglibc-54ed77914a7718f5847aa193dcc5234675b6ef7b.tar.gz
glibc-54ed77914a7718f5847aa193dcc5234675b6ef7b.tar.xz
glibc-54ed77914a7718f5847aa193dcc5234675b6ef7b.zip
Linux: consolidate rmdir implementation
Use rmdir 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/rmdir.c (renamed from sysdeps/unix/sysv/linux/generic/rmdir.c)9
1 files changed, 7 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/generic/rmdir.c b/sysdeps/unix/sysv/linux/rmdir.c
index 214ddc711b..cd5674f07c 100644
--- a/sysdeps/unix/sysv/linux/generic/rmdir.c
+++ b/sysdeps/unix/sysv/linux/rmdir.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
+/* Delete a directory.  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
 __rmdir (const char *path)
 {
-  return INLINE_SYSCALL (unlinkat, 3, AT_FDCWD, path, AT_REMOVEDIR);
+#ifdef __NR_rmdir
+  return INLINE_SYSCALL_CALL (rmdir, path);
+#else
+  return INLINE_SYSCALL_CALL (unlinkat, AT_FDCWD, path, AT_REMOVEDIR);
+#endif
 }
 weak_alias (__rmdir, rmdir)