clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-05 13:11:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

tmpfiles: finish with EXIT_FAILURE if anything failed

Browse Source 
Return value is successful only if everything succeeded.

(cherry picked from commit 1db50423ba)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2015-01-16 00:56:58 -05:00
parent b6a844bde5
commit 9db605a4db
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tmpfiles/tmpfiles.c
+22 -14
View File
@@ -1063,7 +1063,7 @@ static int clean_item(Item *i) {
}
static int process_item(Item *i) {
int r, q, p;
int r, q, p, s, t = 0;
_cleanup_free_ char *prefix = NULL;
assert(i);
@@ -1081,21 +1081,23 @@ static int process_item(Item *i) {
Item *j;
j = hashmap_get(items, prefix);
if (j)
process_item(j);
if (j) {
int s;
s = process_item(j);
if (s < 0 && t == 0)
t = s;
}
}
r = arg_create ? create_item(i) : 0;
q = arg_remove ? remove_item(i) : 0;
p = arg_clean ? clean_item(i) : 0;
if (r < 0)
return r;
if (q < 0)
return q;
return p;
return t < 0 ? t :
r < 0 ? r :
q < 0 ? q :
p;
}
static void item_free(Item *i) {
@@ -1648,11 +1650,17 @@ int main(int argc, char *argv[]) {
}
}
HASHMAP_FOREACH(i, globs, iterator)
process_item(i);
HASHMAP_FOREACH(i, globs, iterator) {
k = process_item(i);
if (k < 0 && r == 0)
r = k;
}
HASHMAP_FOREACH(i, items, iterator)
process_item(i);
HASHMAP_FOREACH(i, items, iterator) {
k = process_item(i);
if (k < 0 && r == 0)
r = k;
}
finish:
while ((i = hashmap_steal_first(items)))