X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdelta%2Fdelta.c;h=2fdbeeae81e38c66b751a533301a6256e5d8a792;hb=cf4acf84c6304d34108dadd5e87c9a19ca24dceb;hp=f049eb229a45c6716f77598939f28b9d7f863d17;hpb=f939e9a47c54ac37504e8517f316cbec46864d14;p=elogind.git diff --git a/src/delta/delta.c b/src/delta/delta.c index f049eb229..2fdbeeae8 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -4,6 +4,7 @@ This file is part of systemd. Copyright 2012 Lennart Poettering + Copyright 2013 Zbigniew Jędrzejewski-Szmek systemd is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -102,8 +103,9 @@ static int notify_override_masked(const char *top, const char *bottom) { if (!(arg_flags & SHOW_MASKED)) return 0; - printf("%s%s%s %s → %s\n", - ansi_highlight_red(), "[MASKED]", ansi_highlight_off(), top, bottom); + printf("%s%s%s %s %s %s\n", + ansi_highlight_red(), "[MASKED]", ansi_highlight_off(), + top, draw_special_char(DRAW_ARROW), bottom); return 1; } @@ -111,8 +113,9 @@ static int notify_override_equivalent(const char *top, const char *bottom) { if (!(arg_flags & SHOW_EQUIVALENT)) return 0; - printf("%s%s%s %s → %s\n", - ansi_highlight_green(), "[EQUIVALENT]", ansi_highlight_off(), top, bottom); + printf("%s%s%s %s %s %s\n", + ansi_highlight_green(), "[EQUIVALENT]", ansi_highlight_off(), + top, draw_special_char(DRAW_ARROW), bottom); return 1; } @@ -120,8 +123,9 @@ static int notify_override_redirected(const char *top, const char *bottom) { if (!(arg_flags & SHOW_REDIRECTED)) return 0; - printf("%s%s%s %s → %s\n", - ansi_highlight(), "[REDIRECTED]", ansi_highlight_off(), top, bottom); + printf("%s%s%s %s %s %s\n", + ansi_highlight(), "[REDIRECTED]", ansi_highlight_off(), + top, draw_special_char(DRAW_ARROW), bottom); return 1; } @@ -129,8 +133,9 @@ static int notify_override_overridden(const char *top, const char *bottom) { if (!(arg_flags & SHOW_OVERRIDDEN)) return 0; - printf("%s%s%s %s → %s\n", - ansi_highlight(), "[OVERRIDDEN]", ansi_highlight_off(), top, bottom); + printf("%s%s%s %s %s %s\n", + ansi_highlight(), "[OVERRIDDEN]", ansi_highlight_off(), + top, draw_special_char(DRAW_ARROW), bottom); return 1; } @@ -138,8 +143,9 @@ static int notify_override_extended(const char *top, const char *bottom) { if (!(arg_flags & SHOW_EXTENDED)) return 0; - printf("%s%s%s %s → %s\n", - ansi_highlight(), "[EXTENDED]", ansi_highlight_off(), top, bottom); + printf("%s%s%s %s %s %s\n", + ansi_highlight(), "[EXTENDED]", ansi_highlight_off(), + top, draw_special_char(DRAW_ARROW), bottom); return 1; } @@ -153,7 +159,7 @@ static int notify_override_unchanged(const char *f) { static int found_override(const char *top, const char *bottom) { _cleanup_free_ char *dest = NULL; - int k; + int k, r; pid_t pid; assert(top); @@ -188,7 +194,9 @@ static int found_override(const char *top, const char *bottom) { _exit(1); } - wait_for_terminate(pid, NULL); + r = wait_for_terminate(pid, NULL); + if (r < 0) + log_warning("Failed to wait for diff: %s", strerror(-r)); putchar('\n'); @@ -240,7 +248,7 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const return -ENOMEM; d = p + strlen(toppath) + 1; - log_debug("Adding at top: %s → %s", d, p); + log_debug("Adding at top: %s %s %s", d, draw_special_char(DRAW_ARROW), p); k = hashmap_put(top, d, p); if (k >= 0) { p = strdup(p); @@ -252,7 +260,7 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const return k; } - log_debug("Adding at bottom: %s → %s", d, p); + log_debug("Adding at bottom: %s %s %s", d, draw_special_char(DRAW_ARROW), p); free(hashmap_remove(bottom, d)); k = hashmap_put(bottom, d, p); if (k < 0) { @@ -262,7 +270,7 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const h = hashmap_get(drops, unit); if (!h) { - h = hashmap_new(string_hash_func, string_compare_func); + h = hashmap_new(&string_hash_ops); if (!h) return -ENOMEM; hashmap_put(drops, unit, h); @@ -275,7 +283,8 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const if (!p) return -ENOMEM; - log_debug("Adding to drops: %s → %s → %s", unit, basename(p), p); + log_debug("Adding to drops: %s %s %s %s %s", + unit, draw_special_char(DRAW_ARROW), basename(p), draw_special_char(DRAW_ARROW), p); k = hashmap_put(h, basename(p), p); if (k < 0) { free(p); @@ -315,6 +324,8 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch if (!de) return -errno; + dirent_ensure_type(d, de); + if (dropins && de->d_type == DT_DIR && endswith(de->d_name, ".d")) enumerate_dir_d(top, bottom, drops, path, de->d_name); @@ -325,7 +336,7 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch if (!p) return -ENOMEM; - log_debug("Adding at top: %s → %s", basename(p), p); + log_debug("Adding at top: %s %s %s", basename(p), draw_special_char(DRAW_ARROW), p); k = hashmap_put(top, basename(p), p); if (k >= 0) { p = strdup(p); @@ -336,7 +347,7 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch return k; } - log_debug("Adding at bottom: %s → %s", basename(p), p); + log_debug("Adding at bottom: %s %s %s", basename(p), draw_special_char(DRAW_ARROW), p); free(hashmap_remove(bottom, basename(p))); k = hashmap_put(bottom, basename(p), p); if (k < 0) { @@ -346,7 +357,7 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch } } -static int process_suffix(const char *suffix) { +static int process_suffix(const char *suffix, const char *onlyprefix) { const char *p; char *f; Hashmap *top, *bottom, *drops; @@ -363,9 +374,9 @@ static int process_suffix(const char *suffix) { dropins = nulstr_contains(have_dropins, suffix); - top = hashmap_new(string_hash_func, string_compare_func); - bottom = hashmap_new(string_hash_func, string_compare_func); - drops = hashmap_new(string_hash_func, string_compare_func); + top = hashmap_new(&string_hash_ops); + bottom = hashmap_new(&string_hash_ops); + drops = hashmap_new(&string_hash_ops); if (!top || !bottom || !drops) { r = -ENOMEM; goto finish; @@ -391,20 +402,23 @@ static int process_suffix(const char *suffix) { o = hashmap_get(bottom, key); assert(o); - if (path_equal(o, f)) - notify_override_unchanged(f); - else { - k = found_override(f, o); - if (k < 0) - r = k; - else - n_found += k; + if (!onlyprefix || startswith(o, onlyprefix)) { + if (path_equal(o, f)) { + notify_override_unchanged(f); + } else { + k = found_override(f, o); + if (k < 0) + r = k; + else + n_found += k; + } } h = hashmap_get(drops, key); if (h) HASHMAP_FOREACH(o, h, j) - n_found += notify_override_extended(f, o); + if (!onlyprefix || startswith(o, onlyprefix)) + n_found += notify_override_extended(f, o); } finish: @@ -423,59 +437,73 @@ finish: return r < 0 ? r : n_found; } -static int process_suffix_chop(const char *suffix) { +static int process_suffixes(const char *onlyprefix) { + const char *n; + int n_found = 0, r; + + NULSTR_FOREACH(n, suffixes) { + r = process_suffix(n, onlyprefix); + if (r < 0) + return r; + else + n_found += r; + } + return n_found; +} + +static int process_suffix_chop(const char *arg) { const char *p; - assert(suffix); + assert(arg); - if (!path_is_absolute(suffix)) - return process_suffix(suffix); + if (!path_is_absolute(arg)) + return process_suffix(arg, NULL); /* Strip prefix from the suffix */ NULSTR_FOREACH(p, prefixes) { - if (startswith(suffix, p)) { - suffix += strlen(p); + const char *suffix = startswith(arg, p); + if (suffix) { suffix += strspn(suffix, "/"); - return process_suffix(suffix); + if (*suffix) + return process_suffix(suffix, NULL); + else + return process_suffixes(arg); } } - log_error("Invalid suffix specification %s.", suffix); + log_error("Invalid suffix specification %s.", arg); return -EINVAL; } -static int help(void) { - +static void help(void) { printf("%s [OPTIONS...] [SUFFIX...]\n\n" "Find overridden configuration files.\n\n" " -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 overridden files differ\n" - " -t --type=LIST... Only display a selected set of override types\n", - program_invocation_short_name); - - return 0; + " -t --type=LIST... Only display a selected set of override types\n" + , program_invocation_short_name); } static int parse_flags(const char *flag_str, int flags) { - char *w, *state; + const char *word, *state; size_t l; - FOREACH_WORD(w, l, flag_str, state) { - if (strneq("masked", w, l)) + FOREACH_WORD(word, l, flag_str, state) { + if (strneq("masked", word, l)) flags |= SHOW_MASKED; - else if (strneq ("equivalent", w, l)) + else if (strneq ("equivalent", word, l)) flags |= SHOW_EQUIVALENT; - else if (strneq("redirected", w, l)) + else if (strneq("redirected", word, l)) flags |= SHOW_REDIRECTED; - else if (strneq("overridden", w, l)) + else if (strneq("overridden", word, l)) flags |= SHOW_OVERRIDDEN; - else if (strneq("unchanged", w, l)) + else if (strneq("unchanged", word, l)) flags |= SHOW_UNCHANGED; - else if (strneq("extended", w, l)) + else if (strneq("extended", word, l)) flags |= SHOW_EXTENDED; - else if (strneq("default", w, l)) + else if (strneq("default", word, l)) flags |= SHOW_DEFAULTS; else return -EINVAL; @@ -505,7 +533,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 1); assert(argv); - while ((c = getopt_long(argc, argv, "ht:", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "ht:", options, NULL)) >= 0) switch (c) { @@ -556,7 +584,6 @@ static int parse_argv(int argc, char *argv[]) { default: assert_not_reached("Unhandled option"); } - } return 1; } @@ -595,15 +622,11 @@ int main(int argc, char *argv[]) { } } else { - const char *n; - - NULSTR_FOREACH(n, suffixes) { - k = process_suffix(n); - if (k < 0) - r = k; - else - n_found += k; - } + k = process_suffixes(NULL); + if (k < 0) + r = k; + else + n_found += k; } if (r >= 0)