pager_open(false);
}
-static inline const char* arrow(void) {
- return is_locale_utf8() ? "→" : "->";
-}
-
static int equivalent(const char *a, const char *b) {
_cleanup_free_ char *x = NULL, *y = NULL;
printf("%s%s%s %s %s %s\n",
ansi_highlight_red(), "[MASKED]", ansi_highlight_off(),
- top, arrow(), bottom);
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
printf("%s%s%s %s %s %s\n",
ansi_highlight_green(), "[EQUIVALENT]", ansi_highlight_off(),
- top, arrow(), bottom);
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
printf("%s%s%s %s %s %s\n",
ansi_highlight(), "[REDIRECTED]", ansi_highlight_off(),
- top, arrow(), bottom);
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
printf("%s%s%s %s %s %s\n",
ansi_highlight(), "[OVERRIDDEN]", ansi_highlight_off(),
- top, arrow(), bottom);
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
printf("%s%s%s %s %s %s\n",
ansi_highlight(), "[EXTENDED]", ansi_highlight_off(),
- top, arrow(), bottom);
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
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;
*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;
return -ENOMEM;
d = p + strlen(toppath) + 1;
- log_debug("Adding at top: %s %s %s", d, arrow(), 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);
return k;
}
- log_debug("Adding at bottom: %s %s %s", d, arrow(), 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) {
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);
return -ENOMEM;
log_debug("Adding to drops: %s %s %s %s %s",
- unit, arrow(), basename(p), arrow(), p);
+ 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);
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;
}
if (!p)
return -ENOMEM;
- log_debug("Adding at top: %s %s %s", basename(p), arrow(), 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);
return k;
}
- log_debug("Adding at bottom: %s %s %s", basename(p), arrow(), 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) {
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;
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;
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) {
default:
assert_not_reached("Unhandled option");
}
- }
return 1;
}