chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: auto-convert the simple cases to log_*_errno()
[elogind.git]
/
src
/
delta
/
delta.c
diff --git
a/src/delta/delta.c
b/src/delta/delta.c
index 4aaf1dfb143e64e8ea393a3908395391565a5c95..2a1ad3d951f55517291c21da7faaa79a30d92ca8 100644
(file)
--- a/
src/delta/delta.c
+++ b/
src/delta/delta.c
@@
-4,6
+4,7
@@
This file is part of systemd.
Copyright 2012 Lennart Poettering
This file is part of systemd.
Copyright 2012 Lennart Poettering
+ Copyright 2013 Zbigniew Jędrzejewski-Szmek
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@
-33,6
+34,34
@@
#include "build.h"
#include "strv.h"
#include "build.h"
#include "strv.h"
+static const char prefixes[] =
+ "/etc\0"
+ "/run\0"
+ "/usr/local/lib\0"
+ "/usr/local/share\0"
+ "/usr/lib\0"
+ "/usr/share\0"
+#ifdef HAVE_SPLIT_USR
+ "/lib\0"
+#endif
+ ;
+
+static const char suffixes[] =
+ "sysctl.d\0"
+ "tmpfiles.d\0"
+ "modules-load.d\0"
+ "binfmt.d\0"
+ "systemd/system\0"
+ "systemd/user\0"
+ "systemd/system-preset\0"
+ "systemd/user-preset\0"
+ "udev/rules.d\0"
+ "modprobe.d\0";
+
+static const char have_dropins[] =
+ "systemd/system\0"
+ "systemd/user\0";
+
static bool arg_no_pager = false;
static int arg_diff = -1;
static bool arg_no_pager = false;
static int arg_diff = -1;
@@
-48,6
+77,14
@@
static enum {
(SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDDEN | SHOW_EXTENDED)
} arg_flags = 0;
(SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDDEN | SHOW_EXTENDED)
} arg_flags = 0;
+static void pager_open_if_enabled(void) {
+
+ if (arg_no_pager)
+ return;
+
+ pager_open(false);
+}
+
static int equivalent(const char *a, const char *b) {
_cleanup_free_ char *x = NULL, *y = NULL;
static int equivalent(const char *a, const char *b) {
_cleanup_free_ char *x = NULL, *y = NULL;
@@
-66,8
+103,9
@@
static int notify_override_masked(const char *top, const char *bottom) {
if (!(arg_flags & SHOW_MASKED))
return 0;
if (!(arg_flags & SHOW_MASKED))
return 0;
- printf("%s%s%s %s → %s\n",
- ansi_highlight_red(), "[MASKED]", ansi_highlight_off(), top, bottom);
+ printf("%s%s%s %s %s %s\n",
+ ansi_highlight_red(), "[MASKED]", ansi_highlight_off(),
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
return 1;
}
@@
-75,8
+113,9
@@
static int notify_override_equivalent(const char *top, const char *bottom) {
if (!(arg_flags & SHOW_EQUIVALENT))
return 0;
if (!(arg_flags & SHOW_EQUIVALENT))
return 0;
- printf("%s%s%s %s → %s\n",
- ansi_highlight_green(), "[EQUIVALENT]", ansi_highlight(), top, bottom);
+ printf("%s%s%s %s %s %s\n",
+ ansi_highlight_green(), "[EQUIVALENT]", ansi_highlight_off(),
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
return 1;
}
@@
-84,8
+123,9
@@
static int notify_override_redirected(const char *top, const char *bottom) {
if (!(arg_flags & SHOW_REDIRECTED))
return 0;
if (!(arg_flags & SHOW_REDIRECTED))
return 0;
- printf("%s%s%s %s → %s\n",
- ansi_highlight(), "[REDIRECTED]", ansi_highlight_off(), top, bottom);
+ printf("%s%s%s %s %s %s\n",
+ ansi_highlight(), "[REDIRECTED]", ansi_highlight_off(),
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
return 1;
}
@@
-93,8
+133,9
@@
static int notify_override_overridden(const char *top, const char *bottom) {
if (!(arg_flags & SHOW_OVERRIDDEN))
return 0;
if (!(arg_flags & SHOW_OVERRIDDEN))
return 0;
- printf("%s%s%s %s → %s\n",
- ansi_highlight(), "[OVERRIDDEN]", ansi_highlight_off(), top, bottom);
+ printf("%s%s%s %s %s %s\n",
+ ansi_highlight(), "[OVERRIDDEN]", ansi_highlight_off(),
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
return 1;
}
@@
-102,8
+143,9
@@
static int notify_override_extended(const char *top, const char *bottom) {
if (!(arg_flags & SHOW_EXTENDED))
return 0;
if (!(arg_flags & SHOW_EXTENDED))
return 0;
- printf("%s%s%s %s → %s\n",
- ansi_highlight(), "[EXTENDED]", ansi_highlight_off(), top, bottom);
+ printf("%s%s%s %s %s %s\n",
+ ansi_highlight(), "[EXTENDED]", ansi_highlight_off(),
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
return 1;
}
@@
-152,39
+194,40
@@
static int found_override(const char *top, const char *bottom) {
_exit(1);
}
_exit(1);
}
- wait_for_terminate(pid, NULL);
-
+ wait_for_terminate_and_warn("diff", pid);
putchar('\n');
return k;
}
static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const char *toppath, const char *drop) {
putchar('\n');
return k;
}
static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const char *toppath, const char *drop) {
- _cleanup_free_ char *
conf
= NULL;
+ _cleanup_free_ char *
unit
= NULL;
_cleanup_free_ char *path = NULL;
_cleanup_strv_free_ char **list = NULL;
char **file;
char *c;
int r;
_cleanup_free_ char *path = NULL;
_cleanup_strv_free_ char **list = NULL;
char **file;
char *c;
int r;
+ assert(!endswith(drop, "/"));
+
path = strjoin(toppath, "/", drop, NULL);
if (!path)
return -ENOMEM;
path = strjoin(toppath, "/", drop, NULL);
if (!path)
return -ENOMEM;
-
path_kill_slashes(
path);
+
log_debug("Looking at %s",
path);
-
conf
= strdup(drop);
- if (!
conf
)
+
unit
= strdup(drop);
+ if (!
unit
)
return -ENOMEM;
return -ENOMEM;
- c = strrchr(
conf
, '.');
+ c = strrchr(
unit
, '.');
if (!c)
return -EINVAL;
*c = 0;
r = get_files_in_directory(path, &list);
if (r < 0){
if (!c)
return -EINVAL;
*c = 0;
r = get_files_in_directory(path, &list);
if (r < 0){
- log_error
("Failed to enumerate %s: %s", path, strerror(-r)
);
+ log_error
_errno(-r, "Failed to enumerate %s: %m", path
);
return r;
}
return r;
}
@@
-200,35
+243,21
@@
static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
p = strjoin(path, "/", *file, NULL);
if (!p)
return -ENOMEM;
p = strjoin(path, "/", *file, NULL);
if (!p)
return -ENOMEM;
+ d = p + strlen(toppath) + 1;
- path_kill_slashes(p);
-
- d = strrchr(p, '/');
- if (!d || d == p) {
- free(p);
- return -EINVAL;
- }
- d--;
- d = strrchr(p, '/');
-
- if (!d || d == p) {
- free(p);
- return -EINVAL;
- }
-
+ 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);
if (!p)
return -ENOMEM;
k = hashmap_put(top, d, p);
if (k >= 0) {
p = strdup(p);
if (!p)
return -ENOMEM;
- d = strrchr(p, '/');
- d--;
- d = strrchr(p, '/');
+ d = p + strlen(toppath) + 1;
} else if (k != -EEXIST) {
free(p);
return k;
}
} else if (k != -EEXIST) {
free(p);
return k;
}
+ 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) {
free(hashmap_remove(bottom, d));
k = hashmap_put(bottom, d, p);
if (k < 0) {
@@
-236,14
+265,14
@@
static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
return k;
}
return k;
}
- h = hashmap_get(drops,
conf
);
+ h = hashmap_get(drops,
unit
);
if (!h) {
if (!h) {
- h = hashmap_new(
string_hash_func, string_compare_func
);
+ h = hashmap_new(
&string_hash_ops
);
if (!h)
return -ENOMEM;
if (!h)
return -ENOMEM;
- hashmap_put(drops,
conf
, h);
-
conf = strdup(conf
);
- if (!
conf
)
+ hashmap_put(drops,
unit
, h);
+
unit = strdup(unit
);
+ if (!
unit
)
return -ENOMEM;
}
return -ENOMEM;
}
@@
-251,7
+280,9
@@
static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
if (!p)
return -ENOMEM;
if (!p)
return -ENOMEM;
- k = hashmap_put(h, path_get_file_name(p), p);
+ log_debug("Adding to drops: %s %s %s %s %s",
+ 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 (k != -EEXIST)
if (k < 0) {
free(p);
if (k != -EEXIST)
@@
-269,27
+300,28
@@
static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
assert(drops);
assert(path);
assert(drops);
assert(path);
+ log_debug("Looking at %s", path);
+
d = opendir(path);
if (!d) {
if (errno == ENOENT)
return 0;
d = opendir(path);
if (!d) {
if (errno == ENOENT)
return 0;
- log_error("Failed to
enumerate
%s: %m", path);
+ log_error("Failed to
open
%s: %m", path);
return -errno;
}
for (;;) {
struct dirent *de;
return -errno;
}
for (;;) {
struct dirent *de;
- union dirent_storage buf;
int k;
char *p;
int k;
char *p;
- k = readdir_r(d, &buf.de, &de);
- if (k != 0)
- return -k;
-
+ errno = 0;
+ de = readdir(d);
if (!de)
if (!de)
- break;
+ return -errno;
+
+ dirent_ensure_type(d, de);
if (dropins && de->d_type == DT_DIR && endswith(de->d_name, ".d"))
enumerate_dir_d(top, bottom, drops, path, de->d_name);
if (dropins && de->d_type == DT_DIR && endswith(de->d_name, ".d"))
enumerate_dir_d(top, bottom, drops, path, de->d_name);
@@
-301,9
+333,8
@@
static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
if (!p)
return -ENOMEM;
if (!p)
return -ENOMEM;
- path_kill_slashes(p);
-
- k = hashmap_put(top, path_get_file_name(p), 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);
if (!p)
if (k >= 0) {
p = strdup(p);
if (!p)
@@
-313,44
+344,37
@@
static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
return k;
}
return k;
}
- free(hashmap_remove(bottom, path_get_file_name(p)));
- k = hashmap_put(bottom, path_get_file_name(p), 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) {
free(p);
return k;
}
}
if (k < 0) {
free(p);
return k;
}
}
-
- return 0;
}
}
-static int process_suffix(const char *
prefixes, const char *suffix, bool dropins
) {
+static int process_suffix(const char *
suffix, const char *onlyprefix
) {
const char *p;
char *f;
const char *p;
char *f;
- Hashmap *top, *bottom
=NULL, *drops=NULL
;
+ Hashmap *top, *bottom
, *drops
;
Hashmap *h;
char *key;
int r = 0, k;
Iterator i, j;
int n_found = 0;
Hashmap *h;
char *key;
int r = 0, k;
Iterator i, j;
int n_found = 0;
+ bool dropins;
- assert(prefixes);
assert(suffix);
assert(suffix);
+ assert(!startswith(suffix, "/"));
+ assert(!strstr(suffix, "//"));
- top = hashmap_new(string_hash_func, string_compare_func);
- if (!top) {
- r = -ENOMEM;
- goto finish;
- }
-
- bottom = hashmap_new(string_hash_func, string_compare_func);
- if (!bottom) {
- r = -ENOMEM;
- goto finish;
- }
+ dropins = nulstr_contains(have_dropins, suffix);
- drops = hashmap_new(string_hash_func, string_compare_func);
- if (!drops) {
+ 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;
}
r = -ENOMEM;
goto finish;
}
@@
-365,10
+389,8
@@
static int process_suffix(const char *prefixes, const char *suffix, bool dropins
}
k = enumerate_dir(top, bottom, drops, t, dropins);
}
k = enumerate_dir(top, bottom, drops, t, dropins);
- if (
k <
0)
+ if (
r ==
0)
r = k;
r = k;
-
- log_debug("Looking at %s", t);
}
HASHMAP_FOREACH_KEY(f, key, top, i) {
}
HASHMAP_FOREACH_KEY(f, key, top, i) {
@@
-377,20
+399,23
@@
static int process_suffix(const char *prefixes, const char *suffix, bool dropins
o = hashmap_get(bottom, key);
assert(o);
o = hashmap_get(bottom, key);
assert(o);
- if (path_equal(o, f))
- notify_override_unchanged(f);
- else {
- k = found_override(f, o);
- if (k < 0)
- r = k;
- else
- n_found += k;
+ if (!onlyprefix || startswith(o, onlyprefix)) {
+ if (path_equal(o, f)) {
+ notify_override_unchanged(f);
+ } else {
+ k = found_override(f, o);
+ if (k < 0)
+ r = k;
+ else
+ n_found += k;
+ }
}
h = hashmap_get(drops, key);
if (h)
HASHMAP_FOREACH(o, h, j)
}
h = hashmap_get(drops, key);
if (h)
HASHMAP_FOREACH(o, h, j)
- n_found += notify_override_extended(f, o);
+ if (!onlyprefix || startswith(o, onlyprefix))
+ n_found += notify_override_extended(f, o);
}
finish:
}
finish:
@@
-409,60
+434,73
@@
finish:
return r < 0 ? r : n_found;
}
return r < 0 ? r : n_found;
}
-static int process_suffix_chop(const char *prefixes, const char *suffix, const char *have_dropins) {
+static int process_suffixes(const char *onlyprefix) {
+ const char *n;
+ int n_found = 0, r;
+
+ NULSTR_FOREACH(n, suffixes) {
+ r = process_suffix(n, onlyprefix);
+ if (r < 0)
+ return r;
+ else
+ n_found += r;
+ }
+ return n_found;
+}
+
+static int process_suffix_chop(const char *arg) {
const char *p;
const char *p;
- assert(prefixes);
- assert(suffix);
+ assert(arg);
- if (!path_is_absolute(
suffix
))
- return process_suffix(
prefixes, suffix, nulstr_contains(have_dropins, suffix)
);
+ if (!path_is_absolute(
arg
))
+ return process_suffix(
arg, NULL
);
/* Strip prefix from the suffix */
NULSTR_FOREACH(p, prefixes) {
/* Strip prefix from the suffix */
NULSTR_FOREACH(p, prefixes) {
- if (startswith(suffix, p)) {
- suffix += strlen(p);
+ const char *suffix = startswith(arg, p);
+ if (suffix) {
suffix += strspn(suffix, "/");
suffix += strspn(suffix, "/");
- return process_suffix(prefixes, suffix, nulstr_contains(have_dropins, suffix));
+ if (*suffix)
+ return process_suffix(suffix, NULL);
+ else
+ return process_suffixes(arg);
}
}
}
}
- log_error("Invalid suffix specification %s.",
suffix
);
+ log_error("Invalid suffix specification %s.",
arg
);
return -EINVAL;
}
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"
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) {
}
static int parse_flags(const char *flag_str, int flags) {
- c
har *w
, *state;
+ c
onst char *word
, *state;
size_t l;
size_t l;
- FOREACH_WORD(w, l, flag_str, state) {
- if (strneq("masked", w, l))
+ FOREACH_WORD(w
ord
, l, flag_str, state) {
+ if (strneq("masked", w
ord
, l))
flags |= SHOW_MASKED;
flags |= SHOW_MASKED;
- else if (strneq ("equivalent", w, l))
+ else if (strneq ("equivalent", w
ord
, l))
flags |= SHOW_EQUIVALENT;
flags |= SHOW_EQUIVALENT;
- else if (strneq("redirected", w, l))
+ else if (strneq("redirected", w
ord
, l))
flags |= SHOW_REDIRECTED;
flags |= SHOW_REDIRECTED;
- else if (strneq("overridden", w, l))
+ else if (strneq("overridden", w
ord
, l))
flags |= SHOW_OVERRIDDEN;
flags |= SHOW_OVERRIDDEN;
- else if (strneq("unchanged", w, l))
+ else if (strneq("unchanged", w
ord
, l))
flags |= SHOW_UNCHANGED;
flags |= SHOW_UNCHANGED;
- else if (strneq("extended", w, l))
+ else if (strneq("extended", w
ord
, l))
flags |= SHOW_EXTENDED;
flags |= SHOW_EXTENDED;
- else if (strneq("default", w, l))
+ else if (strneq("default", w
ord
, l))
flags |= SHOW_DEFAULTS;
else
return -EINVAL;
flags |= SHOW_DEFAULTS;
else
return -EINVAL;
@@
-492,7
+530,7
@@
static int parse_argv(int argc, char *argv[]) {
assert(argc >= 1);
assert(argv);
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) {
switch (c) {
@@
-543,41
+581,11
@@
static int parse_argv(int argc, char *argv[]) {
default:
assert_not_reached("Unhandled option");
}
default:
assert_not_reached("Unhandled option");
}
- }
return 1;
}
int main(int argc, char *argv[]) {
return 1;
}
int main(int argc, char *argv[]) {
-
- const char prefixes[] =
- "/etc\0"
- "/run\0"
- "/usr/local/lib\0"
- "/usr/local/share\0"
- "/usr/lib\0"
- "/usr/share\0"
-#ifdef HAVE_SPLIT_USR
- "/lib\0"
-#endif
- ;
-
- const char suffixes[] =
- "sysctl.d\0"
- "tmpfiles.d\0"
- "modules-load.d\0"
- "binfmt.d\0"
- "systemd/system\0"
- "systemd/user\0"
- "systemd/system-preset\0"
- "systemd/user-preset\0"
- "udev/rules.d\0"
- "modprobe.d\0";
-
- const char have_dropins[] =
- "systemd/system\0"
- "systemd/user\0";
-
int r = 0, k;
int n_found = 0;
int r = 0, k;
int n_found = 0;
@@
-596,14
+604,14
@@
int main(int argc, char *argv[]) {
else if (arg_diff)
arg_flags |= SHOW_OVERRIDDEN;
else if (arg_diff)
arg_flags |= SHOW_OVERRIDDEN;
- if (!arg_no_pager)
- pager_open(false);
+ pager_open_if_enabled();
if (optind < argc) {
int i;
for (i = optind; i < argc; i++) {
if (optind < argc) {
int i;
for (i = optind; i < argc; i++) {
- k = process_suffix_chop(prefixes, argv[i], have_dropins);
+ path_kill_slashes(argv[i]);
+ k = process_suffix_chop(argv[i]);
if (k < 0)
r = k;
else
if (k < 0)
r = k;
else
@@
-611,15
+619,11
@@
int main(int argc, char *argv[]) {
}
} else {
}
} else {
- const char *n;
-
- NULSTR_FOREACH(n, suffixes) {
- k = process_suffix(prefixes, n, nulstr_contains(have_dropins, n));
- if (k < 0)
- r = k;
- else
- n_found += k;
- }
+ k = process_suffixes(NULL);
+ if (k < 0)
+ r = k;
+ else
+ n_found += k;
}
if (r >= 0)
}
if (r >= 0)