#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;
}
-#define SHOW_MASKED 1 << 0
-#define SHOW_EQUIV 1 << 1
-#define SHOW_REDIR 1 << 2
-#define SHOW_OVERRIDEN 1 << 3
-#define SHOW_UNCHANGED 1 << 4
-#define SHOW_DIFF 1 << 5
-
-#define SHOW_DEFAULTS \
- (SHOW_MASKED | SHOW_EQUIV | SHOW_REDIR | SHOW_OVERRIDEN | SHOW_DIFF)
-
-static int notify_override_masked(int flags, const char *top, const char *bottom) {
- if (!(flags & SHOW_MASKED))
+static int notify_override_masked(const char *top, const char *bottom) {
+ if (!(arg_flags & SHOW_MASKED))
return 0;
- printf(ANSI_HIGHLIGHT_RED_ON "[MASK]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom);
+ printf(ANSI_HIGHLIGHT_RED_ON "[MASKED]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom);
return 1;
}
-static int notify_override_equiv(int flags, const char *top, const char *bottom) {
- if (!(flags & SHOW_EQUIV))
+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_redir(int flags, const char *top, const char *bottom) {
- if (!(flags & SHOW_REDIR))
+static int notify_override_redirected(const char *top, const char *bottom) {
+ if (!(arg_flags & SHOW_REDIRECTED))
return 0;
- printf(ANSI_HIGHLIGHT_ON "[REDIRECT]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom);
+ printf(ANSI_HIGHLIGHT_ON "[REDIRECTED]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom);
return 1;
}
-static int notify_override_overriden(int flags, const char *top, const char *bottom) {
- if (!(flags & SHOW_OVERRIDEN))
+static int notify_override_overridden(const char *top, const char *bottom) {
+ if (!(arg_flags & SHOW_OVERRIDDEN))
return 0;
- printf(ANSI_HIGHLIGHT_ON "[OVERRIDE]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom);
+ printf(ANSI_HIGHLIGHT_ON "[OVERRIDDEN]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom);
return 1;
}
-static int notify_override_unchanged(int flags, const char *top, const char *bottom) {
- if (!(flags & SHOW_UNCHANGED))
+static int notify_override_unchanged(const char *f) {
+ if (!(arg_flags & SHOW_UNCHANGED))
return 0;
- printf(ANSI_HIGHLIGHT_ON "[UNCHANGED]" ANSI_HIGHLIGHT_OFF " %s → %s\n", top, bottom);
+ printf("[UNCHANGED] %s\n", f);
return 1;
}
-static int found_override(int flags, const char *top, const char *bottom) {
+static int found_override(const char *top, const char *bottom) {
char *dest;
int k;
pid_t pid;
assert(bottom);
if (null_or_empty_path(top) > 0) {
- notify_override_masked(flags, top, bottom);
+ notify_override_masked(top, bottom);
goto finish;
}
k = readlink_malloc(top, &dest);
if (k >= 0) {
if (equivalent(dest, bottom) > 0)
- notify_override_equiv(flags, top, bottom);
+ notify_override_equivalent(top, bottom);
else
- notify_override_redir(flags, top, bottom);
+ notify_override_redirected(top, bottom);
free(dest);
goto finish;
}
- notify_override_overriden(flags, top, bottom);
- if (!(flags & SHOW_DIFF))
+ 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;
return r;
}
-static int process_suffix(int flags, const char *prefixes, const char *suffix) {
+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;
assert(o);
if (path_equal(o, f)) {
- notify_override_unchanged(flags, f, o);
+ notify_override_unchanged(f);
continue;
}
- k = found_override(flags, f, o);
+ k = found_override(f, o);
if (k < 0)
r = k;
return r < 0 ? r : n_found;
}
-static int process_suffix_chop(int flags, const char *prefixes, const char *suffix) {
+static int process_suffix_chop(const char *prefixes, const char *suffix) {
const char *p;
assert(prefixes);
assert(suffix);
if (!path_is_absolute(suffix))
- return process_suffix(flags, prefixes, suffix);
+ return process_suffix(prefixes, suffix);
/* Strip prefix from the suffix */
NULSTR_FOREACH(p, prefixes) {
if (startswith(suffix, p)) {
suffix += strlen(p);;
suffix += strspn(suffix, "/");
- return process_suffix(flags, prefixes, suffix);
+ return process_suffix(prefixes, suffix);
}
}
" -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 overriden files differ\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(int flags, const char *flag_str) {
+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) {
+ if (strncmp("masked", w, l) == 0)
flags |= SHOW_MASKED;
- } else if (strncmp ("equivalent", w, l) == 0) {
- flags |= SHOW_EQUIV;
- } else if (strncmp("redirected", w, l) == 0) {
- flags |= SHOW_REDIR;
- } else if (strncmp("override", w, l) == 0) {
- flags |= SHOW_OVERRIDEN;
- } else if (strncmp("unchanged", w, l) == 0) {
+ 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) {
+ else if (strncmp("default", w, l) == 0)
flags |= SHOW_DEFAULTS;
- } else {
- log_error("Unknown type filter: %s", w);
- return -1;
- }
+ else
+ return -EINVAL;
}
return flags;
}
-static int parse_argv(int argc, char *argv[], int *flags) {
+static int parse_argv(int argc, char *argv[]) {
enum {
ARG_NO_PAGER = 0x100,
case '?':
return -EINVAL;
- case 't':
- *flags = parse_flags(*flags, optarg);
- if (*flags < 0)
+ 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) {
- *flags |= SHOW_DIFF;
- } else {
- if (parse_boolean(optarg))
- *flags |= SHOW_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
- *flags &= ~SHOW_DIFF;
+ arg_diff = 0;
}
break;
"binfmt.d\0"
"systemd/system\0"
"systemd/user\0"
- "systemd/system.preset\0"
- "systemd/user.preset\0"
+ "systemd/system-preset\0"
+ "systemd/user-preset\0"
"udev/rules.d\0"
"modprobe.d\0";
int r = 0, k;
int n_found = 0;
- int flags = 0;
log_parse_environment();
log_open();
- r = parse_argv(argc, argv, &flags);
+ r = parse_argv(argc, argv);
if (r <= 0)
goto finish;
- if (flags == 0)
- flags = SHOW_DEFAULTS;
- if (flags == SHOW_DIFF)
- flags |= SHOW_OVERRIDEN;
+ 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();
int i;
for (i = optind; i < argc; i++) {
- k = process_suffix_chop(flags, prefixes, argv[i]);
+ k = process_suffix_chop(prefixes, argv[i]);
if (k < 0)
r = k;
else
const char *n;
NULSTR_FOREACH(n, suffixes) {
- k = process_suffix(flags, prefixes, n);
+ k = process_suffix(prefixes, n);
if (k < 0)
r = k;
else
}
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