X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdelta%2Fdelta.c;h=eef6536b01f0897d9d182bc50d0f0f01b00e6b2c;hp=65e720e4eb9165bf1e14105e53c56eb9a851b3ff;hb=b7def684941808600c344f0be7a2b9fcdda97e0f;hpb=7e8d5761ecd4e8bc8f93b1f21861cac2a39a78a1 diff --git a/src/delta/delta.c b/src/delta/delta.c index 65e720e4e..eef6536b0 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -33,6 +33,18 @@ #include "build.h" static bool arg_no_pager = false; +static int arg_diff = -1; + +static enum { + SHOW_MASKED = 1 << 0, + SHOW_EQUIVALENT = 1 << 1, + SHOW_REDIRECTED = 1 << 2, + SHOW_OVERRIDDEN = 1 << 3, + SHOW_UNCHANGED = 1 << 4, + + SHOW_DEFAULTS = + (SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDDEN) +} arg_flags = 0; static int equivalent(const char *a, const char *b) { char *x, *y; @@ -55,6 +67,46 @@ static int equivalent(const char *a, const char *b) { return r; } +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(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_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_overridden(const char *top, const char *bottom) { + if (!(arg_flags & SHOW_OVERRIDDEN)) + return 0; + + printf(ANSI_HIGHLIGHT_ON "[OVERRIDDEN]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom); + return 1; +} + +static int notify_override_unchanged(const char *f) { + if (!(arg_flags & SHOW_UNCHANGED)) + return 0; + + printf("[UNCHANGED] %s\n", f); + return 1; +} + static int found_override(const char *top, const char *bottom) { char *dest; int k; @@ -64,22 +116,24 @@ static int found_override(const char *top, const char *bottom) { assert(bottom); if (null_or_empty_path(top) > 0) { - printf(ANSI_HIGHLIGHT_RED_ON "[MASK]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom); + notify_override_masked(top, bottom); goto finish; } k = readlink_malloc(top, &dest); if (k >= 0) { if (equivalent(dest, bottom) > 0) - printf(ANSI_HIGHLIGHT_GREEN_ON "[EQUIVALENT]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom); + notify_override_equivalent(top, bottom); else - printf(ANSI_HIGHLIGHT_ON "[REDIRECT]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom); + notify_override_redirected(top, bottom); free(dest); goto finish; } - printf(ANSI_HIGHLIGHT_ON "[OVERRIDE]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom); + notify_override_overridden(top, bottom); + if (!arg_diff) + goto finish; putchar('\n'); @@ -138,7 +192,7 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) { if (!dirent_is_file(de)) continue; - p = join(path, "/", de->d_name, NULL); + p = strjoin(path, "/", de->d_name, NULL); if (!p) { r = -ENOMEM; goto finish; @@ -177,7 +231,7 @@ finish: 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; @@ -200,7 +254,7 @@ static int process_suffix(const char *prefixes, const char *suffix) { NULSTR_FOREACH(p, prefixes) { char *t; - t = join(p, "/", suffix, NULL); + t = strjoin(p, "/", suffix, NULL); if (!t) { r = -ENOMEM; goto finish; @@ -220,8 +274,10 @@ static int process_suffix(const char *prefixes, const char *suffix) { o = hashmap_get(bottom, path_get_file_name(f)); assert(o); - if (path_equal(o, f)) + if (path_equal(o, f)) { + notify_override_unchanged(f); continue; + } k = found_override(f, o); if (k < 0) @@ -267,14 +323,40 @@ static void help(void) { "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", + " --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); } +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) + flags |= SHOW_MASKED; + else if (strncmp ("equivalent", w, l) == 0) + flags |= SHOW_EQUIVALENT; + else if (strncmp("redirected", w, l) == 0) + flags |= SHOW_REDIRECTED; + 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) + flags |= SHOW_DEFAULTS; + else + return -EINVAL; + } + return flags; +} + static int parse_argv(int argc, char *argv[]) { enum { ARG_NO_PAGER = 0x100, + ARG_DIFF, ARG_VERSION }; @@ -282,6 +364,8 @@ static int parse_argv(int argc, char *argv[]) { { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, ARG_VERSION }, { "no-pager", no_argument, NULL, ARG_NO_PAGER }, + { "diff", optional_argument, NULL, ARG_DIFF }, + { "type", required_argument, NULL, 't' }, { NULL, 0, NULL, 0 } }; @@ -311,6 +395,34 @@ static int parse_argv(int argc, char *argv[]) { case '?': return -EINVAL; + 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) + 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 + arg_diff = 0; + } + break; + default: log_error("Unknown option code %c", c); return -EINVAL; @@ -338,9 +450,11 @@ int main(int argc, char *argv[]) { "sysctl.d\0" "tmpfiles.d\0" "modules-load.d\0" + "binfmt.d\0" "systemd/system\0" "systemd/user\0" - "binfmt.d\0" + "systemd/system-preset\0" + "systemd/user-preset\0" "udev/rules.d\0" "modprobe.d\0"; @@ -354,6 +468,14 @@ int main(int argc, char *argv[]) { if (r <= 0) goto finish; + 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(); @@ -381,7 +503,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();