From 54ed77914a7718f5847aa193dcc5234675b6ef7b Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Netto Date: Wed, 19 Oct 2022 19:14:15 -0300 Subject: Linux: consolidate rmdir implementation Use rmdir syscall if defined, otherwise use unlinkat. Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/generic/rmdir.c | 28 ---------------------------- sysdeps/unix/sysv/linux/rmdir.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 28 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/generic/rmdir.c create mode 100644 sysdeps/unix/sysv/linux/rmdir.c diff --git a/sysdeps/unix/sysv/linux/generic/rmdir.c b/sysdeps/unix/sysv/linux/generic/rmdir.c deleted file mode 100644 index 214ddc7..0000000 --- a/sysdeps/unix/sysv/linux/generic/rmdir.c +++ /dev/null @@ -1,28 +0,0 @@ -/* 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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -#include -#include -#include - -/* Remove the directory PATH. */ -int -__rmdir (const char *path) -{ - return INLINE_SYSCALL (unlinkat, 3, AT_FDCWD, path, AT_REMOVEDIR); -} -weak_alias (__rmdir, rmdir) diff --git a/sysdeps/unix/sysv/linux/rmdir.c b/sysdeps/unix/sysv/linux/rmdir.c new file mode 100644 index 0000000..cd5674f --- /dev/null +++ b/sysdeps/unix/sysv/linux/rmdir.c @@ -0,0 +1,33 @@ +/* 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library. If not, see + . */ + +#include +#include +#include + +/* Remove the directory PATH. */ +int +__rmdir (const char *path) +{ +#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) -- cgit v1.1