X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdelta%2Fdelta.c;h=a3a121fb0c5526ad4112f39d9a1d6289130926e4;hb=8b5e2af10830d55b2032e6c79d0cd1f959bb5b7f;hp=369f8f862a86605026780fb7a9fb3fbabafea88d;hpb=277f2f75f69bbd5868c74991011c804ce00dfed9;p=elogind.git diff --git a/src/delta/delta.c b/src/delta/delta.c index 369f8f862..a3a121fb0 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -103,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; } @@ -112,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; } @@ -121,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; } @@ -130,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; } @@ -139,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; } @@ -180,17 +185,15 @@ static int found_override(const char *top, const char *bottom) { fflush(stdout); pid = fork(); - if (pid < 0) { - log_error("Failed to fork off diff: %m"); - return -errno; - } else if (pid == 0) { + if (pid < 0) + return log_error_errno(errno, "Failed to fork off diff: %m"); + else if (pid == 0) { execlp("diff", "diff", "-us", "--", bottom, top, NULL); - log_error("Failed to execute diff: %m"); + log_error_errno(errno, "Failed to execute diff: %m"); _exit(1); } - wait_for_terminate(pid, NULL); - + wait_for_terminate_and_warn("diff", pid, false); putchar('\n'); return k; @@ -222,10 +225,8 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const *c = 0; r = get_files_in_directory(path, &list); - if (r < 0){ - log_error("Failed to enumerate %s: %s", path, strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to enumerate %s: %m", path); STRV_FOREACH(file, list) { Hashmap *h; @@ -241,7 +242,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); @@ -253,7 +254,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) { @@ -263,7 +264,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); @@ -276,7 +277,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); @@ -302,7 +304,7 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch if (errno == ENOENT) return 0; - log_error("Failed to open %s: %m", path); + log_error_errno(errno, "Failed to open %s: %m", path); return -errno; } @@ -328,7 +330,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); @@ -339,7 +341,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) { @@ -366,9 +368,9 @@ static int process_suffix(const char *suffix, const char *onlyprefix) { 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; @@ -467,38 +469,35 @@ static int process_suffix_chop(const char *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_SEPARATOR(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; @@ -528,7 +527,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) { @@ -579,7 +578,6 @@ static int parse_argv(int argc, char *argv[]) { default: assert_not_reached("Unhandled option"); } - } return 1; }