X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdelta%2Fdelta.c;h=cc3420829ae2d1e9615606cd6ca52b7a0d135c88;hp=bf58fc517fe76f090f478acbaa32c4c9e813e5da;hb=e26970a82cf810fd1cad5361e1963040640405ba;hpb=c8021373fb7762183487fde795aa5cb9d5ea5a1c diff --git a/src/delta/delta.c b/src/delta/delta.c index bf58fc517..cc3420829 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -33,82 +33,75 @@ #include "build.h" static bool arg_no_pager = false; +static int arg_diff = -1; -enum { +static enum { SHOW_MASKED = 1 << 0, SHOW_EQUIVALENT = 1 << 1, SHOW_REDIRECTED = 1 << 2, - SHOW_OVERRIDEN = 1 << 3, + SHOW_OVERRIDDEN = 1 << 3, SHOW_UNCHANGED = 1 << 4, - SHOW_DIFF = 1 << 5, SHOW_DEFAULTS = - (SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDEN | SHOW_DIFF) -}; + (SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDDEN) +} arg_flags = 0; static int equivalent(const char *a, const char *b) { - char *x, *y; - int r; + _cleanup_free_ char *x = NULL, *y = NULL; x = canonicalize_file_name(a); if (!x) return -errno; y = canonicalize_file_name(b); - if (!y) { - free(x); + if (!y) return -errno; - } - - r = path_equal(x, y); - free(x); - free(y); - return r; + return path_equal(x, y); } -static int notify_override_masked(int flags, const char *top, const char *bottom) { - if (!(flags & SHOW_MASKED)) +static int notify_override_masked(const char *top, const char *bottom) { + if (!(arg_flags & SHOW_MASKED)) return 0; printf(ANSI_HIGHLIGHT_RED_ON "[MASKED]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom); return 1; } -static int notify_override_equivalent(int flags, const char *top, const char *bottom) { - if (!(flags & SHOW_EQUIVALENT)) +static int notify_override_equivalent(const char *top, const char *bottom) { + if (!(arg_flags & SHOW_EQUIVALENT)) return 0; printf(ANSI_HIGHLIGHT_GREEN_ON "[EQUIVALENT]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom); return 1; } -static int notify_override_redirirected(int flags, const char *top, const char *bottom) { - if (!(flags & SHOW_REDIRECTED)) +static int notify_override_redirected(const char *top, const char *bottom) { + if (!(arg_flags & SHOW_REDIRECTED)) return 0; printf(ANSI_HIGHLIGHT_ON "[REDIRECTED]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom); return 1; } -static int notify_override_overriden(int flags, const char *top, const char *bottom) { - if (!(flags & SHOW_OVERRIDEN)) +static int notify_override_overridden(const char *top, const char *bottom) { + if (!(arg_flags & SHOW_OVERRIDDEN)) return 0; - printf(ANSI_HIGHLIGHT_ON "[OVERRIDEN]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom); + printf(ANSI_HIGHLIGHT_ON "[OVERRIDDEN]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom); return 1; } -static int notify_override_unchanged(int flags, const char *top, const char *bottom) { - if (!(flags & SHOW_UNCHANGED)) +static int notify_override_unchanged(const char *f) { + if (!(arg_flags & SHOW_UNCHANGED)) return 0; - printf(ANSI_HIGHLIGHT_ON "[UNCHANGED]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom); + printf("[UNCHANGED] %s\n", f); return 1; } -static int found_override(int flags, const char *top, const char *bottom) { - char *dest; +static int found_override(const char *top, const char *bottom) { + _cleanup_free_ char *dest = NULL; int k; pid_t pid; @@ -116,24 +109,23 @@ static int found_override(int flags, const char *top, const char *bottom) { assert(bottom); if (null_or_empty_path(top) > 0) { - notify_override_masked(flags, top, bottom); - goto finish; + notify_override_masked(top, bottom); + return 0; } k = readlink_malloc(top, &dest); if (k >= 0) { if (equivalent(dest, bottom) > 0) - notify_override_equivalent(flags, top, bottom); + notify_override_equivalent(top, bottom); else - notify_override_redirirected(flags, top, bottom); + notify_override_redirected(top, bottom); - free(dest); - goto finish; + return 0; } - notify_override_overriden(flags, top, bottom); - if (!(flags & SHOW_DIFF)) - goto finish; + notify_override_overridden(top, bottom); + if (!arg_diff) + return 0; putchar('\n'); @@ -153,14 +145,11 @@ static int found_override(int flags, const char *top, const char *bottom) { putchar('\n'); -finish: - return 0; } static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) { - DIR *d; - int r = 0; + _cleanup_closedir_ DIR *d; assert(top); assert(bottom); @@ -176,15 +165,14 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) { } for (;;) { - struct dirent *de, buf; + struct dirent *de; + union dirent_storage buf; int k; char *p; - k = readdir_r(d, &buf, &de); - if (k != 0) { - r = -k; - goto finish; - } + k = readdir_r(d, &buf.de, &de); + if (k != 0) + return -k; if (!de) break; @@ -192,46 +180,37 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) { if (!dirent_is_file(de)) continue; - p = join(path, "/", de->d_name, NULL); - if (!p) { - r = -ENOMEM; - goto finish; - } + p = strjoin(path, "/", de->d_name, NULL); + if (!p) + return -ENOMEM; path_kill_slashes(p); k = hashmap_put(top, path_get_file_name(p), p); if (k >= 0) { p = strdup(p); - if (!p) { - r = -ENOMEM; - goto finish; - } + if (!p) + return -ENOMEM; } else if (k != -EEXIST) { free(p); - r = k; - goto finish; + return k; } free(hashmap_remove(bottom, path_get_file_name(p))); k = hashmap_put(bottom, path_get_file_name(p), p); if (k < 0) { free(p); - r = k; - goto finish; + return k; } } -finish: - closedir(d); - - return r; + return 0; } -static int process_suffix(int flags, const char *prefixes, const char *suffix) { +static int process_suffix(const char *prefixes, const char *suffix) { const char *p; char *f; - Hashmap *top, *bottom; + Hashmap *top, *bottom=NULL; int r = 0, k; Iterator i; int n_found = 0; @@ -252,9 +231,9 @@ static int process_suffix(int flags, const char *prefixes, const char *suffix) { } NULSTR_FOREACH(p, prefixes) { - char *t; + _cleanup_free_ char *t = NULL; - t = join(p, "/", suffix, NULL); + t = strjoin(p, "/", suffix, NULL); if (!t) { r = -ENOMEM; goto finish; @@ -265,7 +244,6 @@ static int process_suffix(int flags, const char *prefixes, const char *suffix) { r = k; log_debug("Looking at %s", t); - free(t); } HASHMAP_FOREACH(f, top, i) { @@ -275,11 +253,11 @@ static int process_suffix(int flags, const char *prefixes, const char *suffix) { assert(o); if (path_equal(o, f)) { - notify_override_unchanged(flags, f, o); + notify_override_unchanged(f); continue; } - k = found_override(flags, f, o); + k = found_override(f, o); if (k < 0) r = k; @@ -295,21 +273,21 @@ finish: return r < 0 ? r : n_found; } -static int process_suffix_chop(int flags, const char *prefixes, const char *suffix) { +static int process_suffix_chop(const char *prefixes, const char *suffix) { const char *p; assert(prefixes); assert(suffix); if (!path_is_absolute(suffix)) - return process_suffix(flags, prefixes, suffix); + return process_suffix(prefixes, suffix); /* Strip prefix from the suffix */ NULSTR_FOREACH(p, prefixes) { if (startswith(suffix, p)) { - suffix += strlen(p);; + suffix += strlen(p); suffix += strspn(suffix, "/"); - return process_suffix(flags, prefixes, suffix); + return process_suffix(prefixes, suffix); } } @@ -324,37 +302,35 @@ static void help(void) { " -h --help Show this help\n" " --version Show package version\n" " --no-pager Do not pipe output into a pager\n" - " --diff[=1|0] Show a diff when overriden files differ\n" + " --diff[=1|0] Show a diff when overridden files differ\n" " -t --type=LIST... Only display a selected set of override types\n", program_invocation_short_name); } -static int parse_flags(int flags, const char *flag_str) { +static int parse_flags(const char *flag_str, int flags) { char *w, *state; size_t l; FOREACH_WORD(w, l, flag_str, state) { - if (strncmp("masked", w, l) == 0) { + if (strncmp("masked", w, l) == 0) flags |= SHOW_MASKED; - } else if (strncmp ("equivalent", w, l) == 0) { + else if (strncmp ("equivalent", w, l) == 0) flags |= SHOW_EQUIVALENT; - } else if (strncmp("redirected", w, l) == 0) { + else if (strncmp("redirected", w, l) == 0) flags |= SHOW_REDIRECTED; - } else if (strncmp("override", w, l) == 0) { - flags |= SHOW_OVERRIDEN; - } else if (strncmp("unchanged", w, l) == 0) { + else if (strncmp("overridden", w, l) == 0) + flags |= SHOW_OVERRIDDEN; + else if (strncmp("unchanged", w, l) == 0) flags |= SHOW_UNCHANGED; - } else if (strncmp("default", w, l) == 0) { + else if (strncmp("default", w, l) == 0) flags |= SHOW_DEFAULTS; - } else { - log_error("Unknown type filter: %s", w); - return -1; - } + else + return -EINVAL; } return flags; } -static int parse_argv(int argc, char *argv[], int *flags) { +static int parse_argv(int argc, char *argv[]) { enum { ARG_NO_PAGER = 0x100, @@ -397,20 +373,31 @@ static int parse_argv(int argc, char *argv[], int *flags) { case '?': return -EINVAL; - case 't': - *flags = parse_flags(*flags, optarg); - if (*flags < 0) + case 't': { + int f; + f = parse_flags(optarg, arg_flags); + if (f < 0) { + log_error("Failed to parse flags field."); return -EINVAL; + } + arg_flags = f; break; + } case ARG_DIFF: - if (!optarg) { - *flags |= SHOW_DIFF; - } else { - if (parse_boolean(optarg)) - *flags |= SHOW_DIFF; + if (!optarg) + arg_diff = 1; + else { + int b; + + b = parse_boolean(optarg); + if (b < 0) { + log_error("Failed to parse diff boolean."); + return -EINVAL; + } else if (b) + arg_diff = 1; else - *flags &= ~SHOW_DIFF; + arg_diff = 0; } break; @@ -444,26 +431,28 @@ int main(int argc, char *argv[]) { "binfmt.d\0" "systemd/system\0" "systemd/user\0" - "systemd/system.preset\0" - "systemd/user.preset\0" + "systemd/system-preset\0" + "systemd/user-preset\0" "udev/rules.d\0" "modprobe.d\0"; int r = 0, k; int n_found = 0; - int flags = 0; log_parse_environment(); log_open(); - r = parse_argv(argc, argv, &flags); + r = parse_argv(argc, argv); if (r <= 0) goto finish; - if (flags == 0) - flags = SHOW_DEFAULTS; - if (flags == SHOW_DIFF) - flags |= SHOW_OVERRIDEN; + if (arg_flags == 0) + arg_flags = SHOW_DEFAULTS; + + if (arg_diff < 0) + arg_diff = !!(arg_flags & SHOW_OVERRIDDEN); + else if (arg_diff) + arg_flags |= SHOW_OVERRIDDEN; if (!arg_no_pager) pager_open(); @@ -472,7 +461,7 @@ int main(int argc, char *argv[]) { int i; for (i = optind; i < argc; i++) { - k = process_suffix_chop(flags, prefixes, argv[i]); + k = process_suffix_chop(prefixes, argv[i]); if (k < 0) r = k; else @@ -483,7 +472,7 @@ int main(int argc, char *argv[]) { const char *n; NULSTR_FOREACH(n, suffixes) { - k = process_suffix(flags, prefixes, n); + k = process_suffix(prefixes, n); if (k < 0) r = k; else @@ -492,7 +481,7 @@ int main(int argc, char *argv[]) { } if (r >= 0) - printf("\n%i overriden configuration files found.\n", n_found); + printf("\n%i overridden configuration files found.\n", n_found); finish: pager_close();