From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 1E191382E453; Wed, 7 Dec 2022 19:15:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E191382E453 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670440530; bh=y7WEYzg2Nw26hDi16SMy4XV+PpbMDek4nPCaOwJvO2Y=; h=From:To:Subject:Date:From; b=KBfjDrSJxZtdgs4n9/oowtIYwCP/qIYArt0Rxbp55HNlQ8Bex2rEoscl6fLcVNZ6W y7Xz6h2g5T3aF5ovj4EnZgKcktQ6jEdQd0RL2RG4sdYEKJGEP3zf6/22z8fjvj+Yax DCsoeM9p91d3fGS/m3oM+xOJZJ/r8PqsHy+YuaAc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] Linux: consolidate rmdir implementation X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella Netto X-Git-Refname: refs/heads/master X-Git-Oldrev: 2fc81f6ca56f1df5323fc849f3f8dc40f38fc5b2 X-Git-Newrev: 54ed77914a7718f5847aa193dcc5234675b6ef7b Message-Id: <20221207191530.1E191382E453@sourceware.org> Date: Wed, 7 Dec 2022 19:15:30 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=54ed77914a7718f5847aa193dcc5234675b6ef7b commit 54ed77914a7718f5847aa193dcc5234675b6ef7b Author: Adhemerval Zanella Netto 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 Tested-by: Carlos O'Donell 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)