---
TODO | 3 -
src/delta/delta.c | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 166 insertions(+), 16 deletions(-)
diff --git a/TODO b/TODO
index 9adec5e..96d90d8 100644
--- a/TODO
+++ b/TODO
@@ -95,9 +95,6 @@ Features:
kmod static-nodes
call kmod as an early service, and drop CAP_MKNOD from udevd.service
-* systemd-delta needs to be made aware of *.d/*.conf drop-in files for
- units.
-
* seems that when we follow symlinks to units we prefer the symlink
destination path over /etc and /usr. We shouldn't do that. Instead
/etc should always override /run+/usr and also any symlink
diff --git a/src/delta/delta.c b/src/delta/delta.c
index aec3dc8..0ccb76c 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -41,9 +41,10 @@ static enum {
SHOW_REDIRECTED = 1 << 2,
SHOW_OVERRIDDEN = 1 << 3,
SHOW_UNCHANGED = 1 << 4,
+ SHOW_EXTENDED = 1 << 5,
SHOW_DEFAULTS =
- (SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDDEN)
+ (SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDDEN |
SHOW_EXTENDED)
} arg_flags = 0;
static int equivalent(const char *a, const char *b) {
@@ -92,6 +93,14 @@ static int notify_override_overridden(const char *top, const
char *bottom) {
return 1;
}
+static int notify_override_extended(const char *top, const char *bottom) {
+ if (!(arg_flags & SHOW_EXTENDED))
+ return 0;
+
+ printf(ANSI_HIGHLIGHT_ON "[EXTENDED]" 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;
@@ -148,11 +157,124 @@ static int found_override(const char *top, const char
*bottom) {
return 0;
}
-static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {
+static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops,
const char *toppath, const char *drop) {
+ _cleanup_closedir_ DIR *dir;
+ _cleanup_free_ char *conf = NULL;
+ _cleanup_free_ char *path = NULL;
+ char *c;
+
+ path = strjoin(toppath, "/", drop, NULL);
+ if (!path)
+ return -ENOMEM;
+
+ path_kill_slashes(path);
+
+ conf = strdup(drop);
+ if (!conf)
+ return -ENOMEM;
+
+ c = strrchr(conf, '.');
+ if(!c)
+ return -EINVAL;
+ *c = 0;
+
+ dir = opendir(path);
+ if (!dir) {
+ if (errno == ENOENT)
+ return 0;
+
+ log_error("Failed to enumerate %s: %m", path);
+ return -errno;
+ }
+
+ for (;;) {
+ Hashmap *h;
+ struct dirent *de;
+ union dirent_storage buf;
+ int k;
+ char *p;
+ char *d;
+
+ k = readdir_r(dir, &buf.de, &de);
+ if (k != 0)
+ return -k;
+
+ if (!de)
+ break;
+
+ if (!dirent_is_file_with_suffix(de, ".conf"))
+ continue;
+
+ p = strjoin(path, "/", de->d_name, NULL);
+ if (!p)
+ return -ENOMEM;
+
+ 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;
+ }
+
+ k = hashmap_put(top, d, p);
+ if (k >= 0) {
+ p = strdup(p);
+ if (!p)
+ return -ENOMEM;
+ d = strrchr(p, '/');
+ d --;
+ d = strrchr(p, '/');
+ } else if (k != -EEXIST) {
+ free(p);
+ return k;
+ }
+
+ free(hashmap_remove(bottom, d));
+ k = hashmap_put(bottom, d, p);
+ if (k < 0) {
+ free(p);
+ return k;
+ }
+
+ h = hashmap_get(drops, conf);
+ if (!h) {
+ h = hashmap_new(string_hash_func, string_compare_func);
+ if (!h)
+ return -ENOMEM;
+ hashmap_put(drops, conf, h);
+ conf = strdup(conf);
+ if (!conf)
+ return -ENOMEM;
+ }
+
+ p = strdup(p);
+ if (!p)
+ return -ENOMEM;
+
+ k = hashmap_put(h, path_get_file_name(p), p);
+ if (k < 0) {
+ free(p);
+ if (k != -EEXIST)
+ return k;
+ }
+ }
+ return 0;
+}
+
+static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
char *path, bool units) {
_cleanup_closedir_ DIR *d;
assert(top);
assert(bottom);
+ assert(drops);
assert(path);
d = opendir(path);
@@ -177,6 +299,9 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom,
const char *path) {
if (!de)
break;
+ if (units && de->d_type == DT_DIR && endswith(de->d_name,
".d"))
+ enumerate_dir_d(top, bottom, drops, path, de->d_name);
+
if (!dirent_is_file(de))
continue;
@@ -210,14 +335,20 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom,
const char *path) {
static int process_suffix(const char *prefixes, const char *suffix) {
const char *p;
char *f;
- Hashmap *top, *bottom=NULL;
+ Hashmap *top, *bottom=NULL, *drops=NULL;
+ Hashmap *h;
+ char *key;
int r = 0, k;
- Iterator i;
+ Iterator i, j;
int n_found = 0;
+ bool units = false;
assert(prefixes);
assert(suffix);
+ if (streq(suffix, "systemd/system"))
+ units = true;
+
top = hashmap_new(string_hash_func, string_compare_func);
if (!top) {
r = -ENOMEM;
@@ -230,6 +361,12 @@ static int process_suffix(const char *prefixes, const char
*suffix) {
goto finish;
}
+ drops = hashmap_new(string_hash_func, string_compare_func);
+ if (!drops) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
NULSTR_FOREACH(p, prefixes) {
_cleanup_free_ char *t = NULL;
@@ -239,29 +376,36 @@ static int process_suffix(const char *prefixes, const
char *suffix) {
goto finish;
}
- k = enumerate_dir(top, bottom, t);
+ k = enumerate_dir(top, bottom, drops, t, units);
if (k < 0)
r = k;
log_debug("Looking at %s", t);
}
- HASHMAP_FOREACH(f, top, i) {
+ HASHMAP_FOREACH_KEY(f, key, top, i) {
char *o;
- o = hashmap_get(bottom, path_get_file_name(f));
+ o = hashmap_get(bottom, key);
assert(o);
if (path_equal(o, f)) {
notify_override_unchanged(f);
continue;
}
+ else {
+ k = found_override(f, o);
+ if (k < 0)
+ r = k;
+ n_found ++;
+ }
- k = found_override(f, o);
- if (k < 0)
- r = k;
-
- n_found ++;
+ h = hashmap_get(drops, key);
+ if(h)
+ HASHMAP_FOREACH(o, h, j) {
+ notify_override_extended(f, o);
+ n_found ++;
+ }
}
finish:
@@ -269,7 +413,14 @@ finish:
hashmap_free_free(top);
if (bottom)
hashmap_free_free(bottom);
-
+ if (drops) {
+ HASHMAP_FOREACH_KEY(h, key, drops, i){
+ hashmap_free_free(hashmap_remove(drops, key));
+ hashmap_remove(drops, key);
+ free(key);
+ }
+ hashmap_free(drops);
+ }
return r < 0 ? r : n_found;
}
@@ -322,6 +473,8 @@ static int parse_flags(const char *flag_str, int flags) {
flags |= SHOW_OVERRIDDEN;
else if (strneq("unchanged", w, l))
flags |= SHOW_UNCHANGED;
+ else if (strneq("extended", w, l))
+ flags |= SHOW_EXTENDED;
else if (strneq("default", w, l))
flags |= SHOW_DEFAULTS;
else
--
1.8.1.4
_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
