X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=load-dropin.c;h=a57bfc455be3d45b5a30f5b9e0c3b08ec214271b;hb=c25fb0edbb8a1d4fc2e466a355e7d3e5ddeacd5e;hp=7105cb86a6d8eaa731ffbef8e5fefc543a4b9086;hpb=5cb5a6ffc33667c93e9bc3572534dcaa684046e3;p=elogind.git

diff --git a/load-dropin.c b/load-dropin.c
index 7105cb86a..a57bfc455 100644
--- a/load-dropin.c
+++ b/load-dropin.c
@@ -1,11 +1,79 @@
 /*-*- Mode: C; c-basic-offset: 8 -*-*/
 
+#include <dirent.h>
+#include <errno.h>
+
+#include "unit.h"
 #include "load-dropin.h"
+#include "log.h"
+
+int unit_load_dropin(Unit *u) {
+        Iterator i;
+        int r;
+        char *t;
 
-int name_load_dropin(Name *n) {
-        assert(n);
+        assert(u);
 
         /* Load dependencies from supplementary drop-in directories */
 
+        SET_FOREACH(t, u->meta.names, i) {
+                char *path;
+                DIR *d;
+                struct dirent *de;
+
+                if (asprintf(&path, "%s/%s.wants", unit_path(), t) < 0)
+                        return -ENOMEM;
+
+                if (!(d = opendir(path))) {
+                        r = -errno;
+                        free(path);
+
+                        if (r == -ENOENT)
+                                continue;
+
+                        return r;
+                }
+
+                free(path);
+
+                while ((de = readdir(d))) {
+                        Unit *other;
+
+                        if (de->d_name[0] == '.')
+                                continue;
+
+                        assert(de->d_name[0]);
+
+                        if (de->d_name[strlen(de->d_name)-1] == '~')
+                                continue;
+
+                        if (asprintf(&path, "%s/%s.wants/%s", unit_path(), t, de->d_name) < 0) {
+                                closedir(d);
+                                return -ENOMEM;
+                        }
+
+                        if (!unit_name_is_valid(de->d_name)) {
+                                log_info("Name of %s is not a valid unit name. Ignoring.", path);
+                                free(path);
+                                continue;
+                        }
+
+                        r = manager_load_unit(u->meta.manager, path, &other);
+                        free(path);
+
+                        if (r < 0) {
+                                closedir(d);
+                                return r;
+                        }
+
+                        if ((r = unit_add_dependency(u, UNIT_WANTS, other)) < 0) {
+                                closedir(d);
+                                return r;
+                        }
+                }
+
+                closedir(d);
+        }
+
         return 0;
 }