a0ba4fbaff
5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch 5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch 5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch These patches will be dropped and cherry-picked from upstream once upstream will commit them in their main branch. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1219
67 lines
2.0 KiB
Diff
67 lines
2.0 KiB
Diff
From 5bc4f2e271c4907af1d3208c5bb33ce795326abc Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Tue, 23 Nov 2021 15:55:45 +0100
|
|
Subject: [PATCH 5000/5002] shared/rm_rf: refactor rm_rf_children_inner() to
|
|
shorten code a bit
|
|
|
|
---
|
|
src/shared/rm-rf.c | 27 +++++++++------------------
|
|
1 file changed, 9 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/src/shared/rm-rf.c b/src/shared/rm-rf.c
|
|
index 19f37e0f19..7362954116 100644
|
|
--- a/src/shared/rm-rf.c
|
|
+++ b/src/shared/rm-rf.c
|
|
@@ -124,7 +124,7 @@ static int rm_rf_children_inner(
|
|
const struct stat *root_dev) {
|
|
|
|
struct stat st;
|
|
- int r;
|
|
+ int r, q = 0;
|
|
|
|
assert(fd >= 0);
|
|
assert(fname);
|
|
@@ -142,7 +142,6 @@ static int rm_rf_children_inner(
|
|
|
|
if (is_dir) {
|
|
_cleanup_close_ int subdir_fd = -1;
|
|
- int q;
|
|
|
|
/* if root_dev is set, remove subdirectories only if device is same */
|
|
if (root_dev && st.st_dev != root_dev->st_dev)
|
|
@@ -178,23 +177,15 @@ static int rm_rf_children_inner(
|
|
* again for each directory */
|
|
q = rm_rf_children(TAKE_FD(subdir_fd), flags | REMOVE_PHYSICAL, root_dev);
|
|
|
|
- r = unlinkat_harder(fd, fname, AT_REMOVEDIR, flags);
|
|
- if (r < 0)
|
|
- return r;
|
|
- if (q < 0)
|
|
- return q;
|
|
-
|
|
- return 1;
|
|
-
|
|
- } else if (!(flags & REMOVE_ONLY_DIRECTORIES)) {
|
|
- r = unlinkat_harder(fd, fname, 0, flags);
|
|
- if (r < 0)
|
|
- return r;
|
|
-
|
|
- return 1;
|
|
- }
|
|
+ } else if (flags & REMOVE_ONLY_DIRECTORIES)
|
|
+ return 0;
|
|
|
|
- return 0;
|
|
+ r = unlinkat_harder(fd, fname, is_dir ? AT_REMOVEDIR : 0, flags);
|
|
+ if (r < 0)
|
|
+ return r;
|
|
+ if (q < 0)
|
|
+ return q;
|
|
+ return 1;
|
|
}
|
|
|
|
int rm_rf_children(
|
|
--
|
|
2.31.1
|
|
|