#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;
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;
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');
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;
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;
NULSTR_FOREACH(p, prefixes) {
char *t;
- t = join(p, "/", suffix, NULL);
+ t = strjoin(p, "/", suffix, NULL);
if (!t) {
r = -ENOMEM;
goto finish;
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)
"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
};
{ "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 }
};
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;
"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";
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();
}
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();
~ianmdlvl / elogind.git / blobdiff