public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] Linux: consolidate rmdir implementation Date: Wed, 7 Dec 2022 19:15:30 +0000 (GMT) [thread overview] Message-ID: <20221207191530.1E191382E453@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=54ed77914a7718f5847aa193dcc5234675b6ef7b commit 54ed77914a7718f5847aa193dcc5234675b6ef7b Author: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org> Date: Wed Oct 19 19:14:15 2022 -0300 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> Diff: --- sysdeps/unix/sysv/linux/{generic => }/rmdir.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/generic/rmdir.c b/sysdeps/unix/sysv/linux/rmdir.c similarity index 78% rename from sysdeps/unix/sysv/linux/generic/rmdir.c rename to 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)
reply other threads:[~2022-12-07 19:15 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221207191530.1E191382E453@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).