chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
docs: install README files into /var/log and 7etc/rc.d/init.d
[elogind.git]
/
src
/
delta
/
delta.c
diff --git
a/src/delta/delta.c
b/src/delta/delta.c
index 0a29d32cc48fcd81fa0abf5f0735d4f045bd0e6c..803d2a7fc798bdc69b86b26e81b7a8b1959ec329 100644
(file)
--- a/
src/delta/delta.c
+++ b/
src/delta/delta.c
@@
-39,11
+39,11
@@
static enum {
SHOW_MASKED = 1 << 0,
SHOW_EQUIVALENT = 1 << 1,
SHOW_REDIRECTED = 1 << 2,
SHOW_MASKED = 1 << 0,
SHOW_EQUIVALENT = 1 << 1,
SHOW_REDIRECTED = 1 << 2,
- SHOW_OVERRIDEN = 1 << 3,
+ SHOW_OVERRID
D
EN = 1 << 3,
SHOW_UNCHANGED = 1 << 4,
SHOW_DEFAULTS =
SHOW_UNCHANGED = 1 << 4,
SHOW_DEFAULTS =
- (SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDEN)
+ (SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRID
D
EN)
} arg_flags = 0;
static int equivalent(const char *a, const char *b) {
} arg_flags = 0;
static int equivalent(const char *a, const char *b) {
@@
-91,11
+91,11
@@
static int notify_override_redirected(const char *top, const char *bottom) {
return 1;
}
return 1;
}
-static int notify_override_overriden(const char *top, const char *bottom) {
- if (!(arg_flags & SHOW_OVERRIDEN))
+static int notify_override_overrid
d
en(const char *top, const char *bottom) {
+ if (!(arg_flags & SHOW_OVERRID
D
EN))
return 0;
return 0;
- printf(ANSI_HIGHLIGHT_ON "[OVERRID
EN]" ANSI_HIGHLIGHT_OFF "
%s → %s\n", top, bottom);
+ printf(ANSI_HIGHLIGHT_ON "[OVERRID
DEN]" ANSI_HIGHLIGHT_OFF "
%s → %s\n", top, bottom);
return 1;
}
return 1;
}
@@
-103,7
+103,7
@@
static int notify_override_unchanged(const char *f) {
if (!(arg_flags & SHOW_UNCHANGED))
return 0;
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;
}
return 1;
}
@@
-131,7
+131,7
@@
static int found_override(const char *top, const char *bottom) {
goto finish;
}
goto finish;
}
- notify_override_overriden(top, bottom);
+ notify_override_overrid
d
en(top, bottom);
if (!arg_diff)
goto finish;
if (!arg_diff)
goto finish;
@@
-176,11
+176,12
@@
static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {
}
for (;;) {
}
for (;;) {
- struct dirent *de, buf;
+ struct dirent *de;
+ union dirent_storage buf;
int k;
char *p;
int k;
char *p;
- k = readdir_r(d, &buf, &de);
+ k = readdir_r(d, &buf
.de
, &de);
if (k != 0) {
r = -k;
goto finish;
if (k != 0) {
r = -k;
goto finish;
@@
-192,7
+193,7
@@
static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {
if (!dirent_is_file(de))
continue;
if (!dirent_is_file(de))
continue;
- p = join(path, "/", de->d_name, NULL);
+ p =
str
join(path, "/", de->d_name, NULL);
if (!p) {
r = -ENOMEM;
goto finish;
if (!p) {
r = -ENOMEM;
goto finish;
@@
-231,7
+232,7
@@
finish:
static int process_suffix(const char *prefixes, const char *suffix) {
const char *p;
char *f;
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;
int r = 0, k;
Iterator i;
int n_found = 0;
@@
-254,7
+255,7
@@
static int process_suffix(const char *prefixes, const char *suffix) {
NULSTR_FOREACH(p, prefixes) {
char *t;
NULSTR_FOREACH(p, prefixes) {
char *t;
- t = join(p, "/", suffix, NULL);
+ t =
str
join(p, "/", suffix, NULL);
if (!t) {
r = -ENOMEM;
goto finish;
if (!t) {
r = -ENOMEM;
goto finish;
@@
-324,7
+325,7
@@
static void help(void) {
" -h --help Show this help\n"
" --version Show package version\n"
" --no-pager Do not pipe output into a pager\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 overriden files differ\n"
+ " --diff[=1|0] Show a diff when overrid
d
en files differ\n"
" -t --type=LIST... Only display a selected set of override types\n",
program_invocation_short_name);
}
" -t --type=LIST... Only display a selected set of override types\n",
program_invocation_short_name);
}
@@
-334,17
+335,17
@@
static int parse_flags(const char *flag_str, int flags) {
size_t l;
FOREACH_WORD(w, l, flag_str, 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;
flags |= SHOW_MASKED;
- } else if (strncmp ("equivalent", w, l) == 0) {
+ else if (strncmp ("equivalent", w, l) == 0)
flags |= SHOW_EQUIVALENT;
flags |= SHOW_EQUIVALENT;
- } else if (strncmp("redirected", w, l) == 0) {
+ else if (strncmp("redirected", w, l) == 0)
flags |= SHOW_REDIRECTED;
flags |= SHOW_REDIRECTED;
- } else if (strncmp("override", w, l) == 0) {
- flags |= SHOW_OVERRIDEN;
- } else if (strncmp("unchanged", w, l) == 0) {
+ else if (strncmp("overridden", w, l) == 0)
+ flags |= SHOW_OVERRID
D
EN;
+ else if (strncmp("unchanged", w, l) == 0)
flags |= SHOW_UNCHANGED;
flags |= SHOW_UNCHANGED;
- } else if (strncmp("default", w, l) == 0) {
+ else if (strncmp("default", w, l) == 0)
flags |= SHOW_DEFAULTS;
else
return -EINVAL;
flags |= SHOW_DEFAULTS;
else
return -EINVAL;
@@
-453,8
+454,8
@@
int main(int argc, char *argv[]) {
"binfmt.d\0"
"systemd/system\0"
"systemd/user\0"
"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";
"udev/rules.d\0"
"modprobe.d\0";
@@
-472,9
+473,9
@@
int main(int argc, char *argv[]) {
arg_flags = SHOW_DEFAULTS;
if (arg_diff < 0)
arg_flags = SHOW_DEFAULTS;
if (arg_diff < 0)
- arg_diff = !!(arg_flags & SHOW_OVERRIDEN);
+ arg_diff = !!(arg_flags & SHOW_OVERRID
D
EN);
else if (arg_diff)
else if (arg_diff)
- arg_flags |= SHOW_OVERRIDEN;
+ arg_flags |= SHOW_OVERRID
D
EN;
if (!arg_no_pager)
pager_open();
if (!arg_no_pager)
pager_open();
@@
-503,7
+504,7
@@
int main(int argc, char *argv[]) {
}
if (r >= 0)
}
if (r >= 0)
- printf("\n%i overriden configuration files found.\n", n_found);
+ printf("\n%i overrid
d
en configuration files found.\n", n_found);
finish:
pager_close();
finish:
pager_close();