picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tmpfiles: finish with EXIT_FAILURE if anything failed

Browse source 
Return value is successful only if everything succeeded.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-01-06 09:53:12 -05:00
parent 553d2243e2
commit 1db50423ba
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/tmpfiles/tmpfiles.c
View file

@ -1123,7 +1123,7 @@ static int clean_item(Item *i) {
} }
static int process_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; _cleanup_free_ char *prefix = NULL;
assert(i); assert(i);
@ -1141,21 +1141,23 @@ static int process_item(Item *i) {
Item *j; Item *j;
j = hashmap_get(items, prefix); j = hashmap_get(items, prefix);
if (j) if (j) {
process_item(j); int s;
s = process_item(j);
if (s < 0 && t == 0)
t = s;
}
} }
r = arg_create ? create_item(i) : 0; r = arg_create ? create_item(i) : 0;
q = arg_remove ? remove_item(i) : 0; q = arg_remove ? remove_item(i) : 0;
p = arg_clean ? clean_item(i) : 0; p = arg_clean ? clean_item(i) : 0;
if (r < 0) return t < 0 ? t :
return r; r < 0 ? r :
q < 0 ? q :
if (q < 0) p;
return q;
return p;
} }
static void item_free(Item *i) { static void item_free(Item *i) {
@ -1735,11 +1737,17 @@ int main(int argc, char *argv[]) {
} }
} }
HASHMAP_FOREACH(i, globs, iterator) HASHMAP_FOREACH(i, globs, iterator) {
process_item(i); k = process_item(i);
if (k < 0 && r == 0)
r = k;
}
HASHMAP_FOREACH(i, items, iterator) HASHMAP_FOREACH(i, items, iterator) {
process_item(i); k = process_item(i);
if (k < 0 && r == 0)
r = k;
}
finish: finish:
while ((i = hashmap_steal_first(items))) while ((i = hashmap_steal_first(items)))