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

systemd-delta: count overrides only of the requested type

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-05-15 20:42:22 -04:00
parent 0000ce05ed
commit 8fd57568e6
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/delta/delta.c
View file

@ -118,24 +118,20 @@ static int found_override(const char *top, const char *bottom) {
assert(top);
assert(bottom);
if (null_or_empty_path(top) > 0) {
notify_override_masked(top, bottom);
return 0;
}
if (null_or_empty_path(top) > 0)
return notify_override_masked(top, bottom);
k = readlink_malloc(top, &dest);
if (k >= 0) {
if (equivalent(dest, bottom) > 0)
notify_override_equivalent(top, bottom);
return notify_override_equivalent(top, bottom);
else
notify_override_redirected(top, bottom);
return 0;
return notify_override_redirected(top, bottom);
}
notify_override_overridden(top, bottom);
k = notify_override_overridden(top, bottom);
if (!arg_diff)
return 0;
return k;
putchar('\n');
@ -155,7 +151,7 @@ static int found_override(const char *top, const char *bottom) {
putchar('\n');
return 0;
return k;
}
static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const char *toppath, const char *drop) {
@ -382,15 +378,14 @@ static int process_suffix(const char *prefixes, const char *suffix, bool dropins
k = found_override(f, o);
if (k < 0)
r = k;
n_found++;
else
n_found += k;
}
h = hashmap_get(drops, key);
if (h)
HASHMAP_FOREACH(o, h, j) {
notify_override_extended(f, o);
n_found++;
}
HASHMAP_FOREACH(o, h, j)
n_found += notify_override_extended(f, o);
}
finish:
@ -622,7 +617,8 @@ int main(int argc, char *argv[]) {
}
if (r >= 0)
printf("\n%i overridden configuration files found.\n", n_found);
printf("%s%i overridden configuration files found.\n",
n_found ? "\n" : "", n_found);
finish:
pager_close();