X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fload-dropin.c;h=eafcc2fdf36ec83c1a2c25dd85057f3dbb926fb5;hp=eef3e6aff2d3992dec70d9ee53d561221da3734b;hb=8112e84f657839a056afb411249a627956518b24;hpb=d6c9574fb558d9e304699b1cc7522c3b133adfc9

diff --git a/src/load-dropin.c b/src/load-dropin.c
index eef3e6aff..eafcc2fdf 100644
--- a/src/load-dropin.c
+++ b/src/load-dropin.c
@@ -28,11 +28,14 @@
 #include "strv.h"
 #include "unit-name.h"
 
-static int iterate_dir(Unit *u, const char *path) {
+static int iterate_dir(Unit *u, const char *path, UnitDependency dependency) {
         DIR *d;
         struct dirent *de;
         int r;
 
+        assert(u);
+        assert(path);
+
         if (!(d = opendir(path))) {
 
                 if (errno == ENOENT)
@@ -47,12 +50,13 @@ static int iterate_dir(Unit *u, const char *path) {
                 if (ignore_file(de->d_name))
                         continue;
 
-                if (asprintf(&f, "%s/%s", path, de->d_name) < 0) {
+                f = join(path, "/", de->d_name, NULL);
+                if (!f) {
                         r = -ENOMEM;
                         goto finish;
                 }
 
-                r = unit_add_dependency_by_name(u, UNIT_WANTS, de->d_name, f, true);
+                r = unit_add_dependency_by_name(u, dependency, de->d_name, f, true);
                 free(f);
 
                 if (r < 0)
@@ -66,58 +70,75 @@ finish:
         return r;
 }
 
-int unit_load_dropin(Unit *u) {
-        Iterator i;
+static int process_dir(Unit *u, const char *unit_path, const char *name, const char *suffix, UnitDependency dependency) {
         int r;
-        char *t;
+        char *path;
 
         assert(u);
+        assert(unit_path);
+        assert(name);
+        assert(suffix);
 
-        /* Load dependencies from supplementary drop-in directories */
+        path = join(unit_path, "/", name, suffix, NULL);
+        if (!path)
+                return -ENOMEM;
 
-        SET_FOREACH(t, u->meta.names, i) {
-                char *path;
-                char **p;
+        if (u->meta.manager->unit_path_cache &&
+            !set_get(u->meta.manager->unit_path_cache, path))
+                r = 0;
+        else
+                r = iterate_dir(u, path, dependency);
+        free(path);
 
-                STRV_FOREACH(p, u->meta.manager->lookup_paths.unit_path) {
+        if (r < 0)
+                return r;
 
-                        if (asprintf(&path, "%s/%s.wants", *p, t) < 0)
-                                return -ENOMEM;
+        if (u->meta.instance) {
+                char *template;
+                /* Also try the template dir */
 
-                        if (u->meta.manager->unit_path_cache &&
-                            !set_get(u->meta.manager->unit_path_cache, path))
-                                r = 0;
-                        else
-                                r = iterate_dir(u, path);
-                        free(path);
+                if (!(template = unit_name_template(name)))
+                        return -ENOMEM;
 
-                        if (r < 0)
-                                return r;
+                path = join(unit_path, "/", template, suffix, NULL);
+                free(template);
+
+                if (!path)
+                        return -ENOMEM;
+
+                if (u->meta.manager->unit_path_cache &&
+                    !set_get(u->meta.manager->unit_path_cache, path))
+                        r = 0;
+                else
+                        r = iterate_dir(u, path, dependency);
+                free(path);
+
+                if (r < 0)
+                        return r;
+        }
+
+        return 0;
+}
 
-                        if (u->meta.instance) {
-                                char *template;
-                                /* Also try the template dir */
+int unit_load_dropin(Unit *u) {
+        Iterator i;
+        char *t;
 
-                                if (!(template = unit_name_template(t)))
-                                        return -ENOMEM;
+        assert(u);
 
-                                r = asprintf(&path, "%s/%s.wants", *p, template);
-                                free(template);
+        /* Load dependencies from supplementary drop-in directories */
 
-                                if (r < 0)
-                                        return -ENOMEM;
+        SET_FOREACH(t, u->meta.names, i) {
+                char **p;
 
-                                if (u->meta.manager->unit_path_cache &&
-                                    !set_get(u->meta.manager->unit_path_cache, path))
-                                        r = 0;
-                                else
-                                        r = iterate_dir(u, path);
-                                free(path);
+                STRV_FOREACH(p, u->meta.manager->lookup_paths.unit_path) {
+                        int r;
 
-                                if (r < 0)
-                                        return r;
-                        }
+                        if ((r = process_dir(u, *p, t, ".wants", UNIT_WANTS)) < 0)
+                                return r;
 
+                        if ((r = process_dir(u, *p, t, ".requires", UNIT_REQUIRES)) < 0)
+                                return r;
                 }
         }