commit: fb74fe22e3eb430ff28bbd884d2ef1546f891051
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 20 19:44:35 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 20 19:44:35 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=fb74fe22
rm_rf: make shallow wrapper around rm_rf_at
Since rm_rf_at now removes the object being pointed at, rm_rf doesn't
have to try doing that again.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
libq/xmkdir.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/libq/xmkdir.c b/libq/xmkdir.c
index ed30d6d..aa93905 100644
--- a/libq/xmkdir.c
+++ b/libq/xmkdir.c
@@ -89,18 +89,7 @@ rm_rf_at(int dfd, const char *path)
static int
rm_rf(const char *path)
{
- rm_rf_at(AT_FDCWD, path);
-
- if (rmdir(path) == 0)
- return 0;
-
- /* if path is a symlink, unlink it */
- if (unlink(path) == 0)
- return 0;
-
- /* XXX: we don't handle:
- * trailing slashes: `rm -rf a/b/c/` -> need to change to a/b/c */
- return -1;
+ return rm_rf_at(AT_FDCWD, path);
}
static int
