X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Finstall.c;h=954dcb1e714357eeb3bd1fccbf3dc69a7f277296;hp=f30bf8317b802cb171193ec5f0ae6f862d48cf6c;hb=99504dd4c13af7516a976fffc0f68e6f26d3faac;hpb=67445f4e22ad924394acdd4fd49e6f238244a5ca

diff --git a/src/shared/install.c b/src/shared/install.c
index f30bf8317..954dcb1e7 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -36,21 +36,19 @@
 #include "install.h"
 #include "conf-parser.h"
 #include "conf-files.h"
-
-typedef struct {
-        char *name;
-        char *path;
-
-        char **aliases;
-        char **wanted_by;
-        char **required_by;
-} InstallInfo;
+#include "specifier.h"
+#include "install-printf.h"
 
 typedef struct {
         Hashmap *will_install;
         Hashmap *have_installed;
 } InstallContext;
 
+#define _cleanup_lookup_paths_free_ \
+        __attribute__((cleanup(lookup_paths_free)))
+#define _cleanup_install_context_done_ \
+        __attribute__((cleanup(install_context_done)))
+
 static int lookup_paths_init_from_scope(LookupPaths *paths, UnitFileScope scope) {
         assert(paths);
         assert(scope >= 0);
@@ -180,11 +178,9 @@ static int mark_symlink_for_removal(
 
         path_kill_slashes(n);
 
-        r = set_put(*remove_symlinks_to, n);
-        if (r < 0) {
-                free(n);
+        r = set_consume(*remove_symlinks_to, n);
+        if (r < 0)
                 return r == -EEXIST ? 0 : r;
-        }
 
         return 0;
 }
@@ -200,8 +196,7 @@ static int remove_marked_symlinks_fd(
                 char** files) {
 
         int r = 0;
-        DIR *d;
-        struct dirent buffer, *de;
+        _cleanup_closedir_ DIR *d = NULL;
 
         assert(remove_symlinks_to);
         assert(fd >= 0);
@@ -218,9 +213,11 @@ static int remove_marked_symlinks_fd(
         rewinddir(d);
 
         for (;;) {
+                struct dirent *de;
+                union dirent_storage buf;
                 int k;
 
-                k = readdir_r(d, &buffer, &de);
+                k = readdir_r(d, &buf.de, &de);
                 if (k != 0) {
                         r = -errno;
                         break;
@@ -236,7 +233,7 @@ static int remove_marked_symlinks_fd(
 
                 if (de->d_type == DT_DIR) {
                         int nfd, q;
-                        char *p;
+                        _cleanup_free_ char *p = NULL;
 
                         nfd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
                         if (nfd < 0) {
@@ -251,32 +248,26 @@ static int remove_marked_symlinks_fd(
                         p = path_make_absolute(de->d_name, path);
                         if (!p) {
                                 close_nointr_nofail(nfd);
-                                r = -ENOMEM;
-                                break;
+                                return -ENOMEM;
                         }
 
                         /* This will close nfd, regardless whether it succeeds or not */
                         q = remove_marked_symlinks_fd(remove_symlinks_to, nfd, p, config_path, deleted, changes, n_changes, files);
-                        free(p);
 
                         if (r == 0)
                                 r = q;
 
                 } else if (de->d_type == DT_LNK) {
-                        char *p, *dest;
+                        _cleanup_free_ char *p = NULL, *dest = NULL;
                         int q;
                         bool found;
 
                         p = path_make_absolute(de->d_name, path);
-                        if (!p) {
-                                r = -ENOMEM;
-                                break;
-                        }
+                        if (!p)
+                                return -ENOMEM;
 
                         q = readlink_and_canonicalize(p, &dest);
                         if (q < 0) {
-                                free(p);
-
                                 if (q == -ENOENT)
                                         continue;
 
@@ -315,14 +306,9 @@ static int remove_marked_symlinks_fd(
                                         }
                                 }
                         }
-
-                        free(p);
-                        free(dest);
                 }
         }
 
-        closedir(d);
-
         return r;
 }
 
@@ -374,8 +360,7 @@ static int find_symlinks_fd(
                 bool *same_name_link) {
 
         int r = 0;
-        DIR *d;
-        struct dirent buffer, *de;
+        _cleanup_closedir_ DIR *d = NULL;
 
         assert(name);
         assert(fd >= 0);
@@ -391,15 +376,15 @@ static int find_symlinks_fd(
 
         for (;;) {
                 int k;
+                struct dirent *de;
+                union dirent_storage buf;
 
-                k = readdir_r(d, &buffer, &de);
-                if (k != 0) {
-                        r = -errno;
-                        break;
-                }
+                k = readdir_r(d, &buf.de, &de);
+                if (k != 0)
+                        return -errno;
 
                 if (!de)
-                        break;
+                        return r;
 
                 if (ignore_file(de->d_name))
                         continue;
@@ -408,7 +393,7 @@ static int find_symlinks_fd(
 
                 if (de->d_type == DT_DIR) {
                         int nfd, q;
-                        char *p;
+                        _cleanup_free_ char *p = NULL;
 
                         nfd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
                         if (nfd < 0) {
@@ -423,39 +408,31 @@ static int find_symlinks_fd(
                         p = path_make_absolute(de->d_name, path);
                         if (!p) {
                                 close_nointr_nofail(nfd);
-                                r = -ENOMEM;
-                                break;
+                                return -ENOMEM;
                         }
 
                         /* This will close nfd, regardless whether it succeeds or not */
                         q = find_symlinks_fd(name, nfd, p, config_path, same_name_link);
-                        free(p);
 
-                        if (q > 0) {
-                                r = 1;
-                                break;
-                        }
+                        if (q > 0)
+                                return 1;
 
                         if (r == 0)
                                 r = q;
 
                 } else if (de->d_type == DT_LNK) {
-                        char *p, *dest;
+                        _cleanup_free_ char *p = NULL, *dest = NULL;
                         bool found_path, found_dest, b = false;
                         int q;
 
                         /* Acquire symlink name */
                         p = path_make_absolute(de->d_name, path);
-                        if (!p) {
-                                r = -ENOMEM;
-                                break;
-                        }
+                        if (!p)
+                                return -ENOMEM;
 
                         /* Acquire symlink destination */
                         q = readlink_and_canonicalize(p, &dest);
                         if (q < 0) {
-                                free(p);
-
                                 if (q == -ENOENT)
                                         continue;
 
@@ -478,37 +455,25 @@ static int find_symlinks_fd(
                         else
                                 found_dest = streq(path_get_file_name(dest), name);
 
-                        free(dest);
-
                         if (found_path && found_dest) {
-                                char *t;
+                                _cleanup_free_ char *t = NULL;
 
                                 /* Filter out same name links in the main
                                  * config path */
                                 t = path_make_absolute(name, config_path);
-                                if (!t) {
-                                        free(p);
-                                        r = -ENOMEM;
-                                        break;
-                                }
+                                if (!t)
+                                        return -ENOMEM;
 
                                 b = path_equal(t, p);
-                                free(t);
                         }
 
-                        free(p);
-
                         if (b)
                                 *same_name_link = true;
-                        else if (found_path || found_dest) {
-                                r = 1;
-                                break;
-                        }
+                        else if (found_path || found_dest)
+                                return 1;
                 }
         }
 
-        closedir(d);
-
         return r;
 }
 
@@ -541,7 +506,7 @@ static int find_symlinks_in_scope(
                 UnitFileState *state) {
 
         int r;
-        char _cleanup_free_ *path = NULL;
+        _cleanup_free_ char *path = NULL;
         bool same_name_link_runtime = false, same_name_link = false;
 
         assert(scope >= 0);
@@ -600,7 +565,7 @@ int unit_file_mask(
                 unsigned *n_changes) {
 
         char **i;
-        char _cleanup_free_ *prefix;
+        _cleanup_free_ char *prefix;
         int r;
 
         assert(scope >= 0);
@@ -611,7 +576,7 @@ int unit_file_mask(
                 return r;
 
         STRV_FOREACH(i, files) {
-                char _cleanup_free_ *path = NULL;
+                _cleanup_free_ char *path = NULL;
 
                 if (!unit_name_is_valid(*i, true)) {
                         if (r == 0)
@@ -733,25 +698,25 @@ int unit_file_link(
                 UnitFileChange **changes,
                 unsigned *n_changes) {
 
-        LookupPaths paths;
-        char **i, *config_path = NULL;
+        _cleanup_lookup_paths_free_ LookupPaths paths = {};
+        char **i;
+        _cleanup_free_ char *config_path = NULL;
         int r, q;
 
         assert(scope >= 0);
         assert(scope < _UNIT_FILE_SCOPE_MAX);
 
-        zero(paths);
-
         r = lookup_paths_init_from_scope(&paths, scope);
         if (r < 0)
                 return r;
 
         r = get_config_path(scope, runtime, root_dir, &config_path);
         if (r < 0)
-                goto finish;
+                return r;
 
         STRV_FOREACH(i, files) {
-                char *path, *fn;
+                _cleanup_free_ char *path = NULL;
+                char *fn;
                 struct stat st;
 
                 fn = path_get_file_name(*i);
@@ -775,48 +740,34 @@ int unit_file_link(
                 }
 
                 q = in_search_path(*i, paths.unit_path);
-                if (q < 0) {
-                        r = q;
-                        break;
-                }
+                if (q < 0)
+                        return q;
 
                 if (q > 0)
                         continue;
 
                 path = path_make_absolute(fn, config_path);
-                if (!path) {
-                        r = -ENOMEM;
-                        break;
-                }
+                if (!path)
+                        return -ENOMEM;
 
                 if (symlink(*i, path) >= 0) {
                         add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, path, *i);
-
-                        free(path);
                         continue;
                 }
 
                 if (errno == EEXIST) {
-                        char *dest = NULL;
+                        _cleanup_free_ char *dest = NULL;
 
                         q = readlink_and_make_absolute(path, &dest);
 
                         if (q < 0 && errno != ENOENT) {
-                                free(path);
-
                                 if (r == 0)
                                         r = q;
-
                                 continue;
                         }
 
-                        if (q >= 0 && path_equal(dest, *i)) {
-                                free(dest);
-                                free(path);
+                        if (q >= 0 && path_equal(dest, *i))
                                 continue;
-                        }
-
-                        free(dest);
 
                         if (force) {
                                 unlink(path);
@@ -826,7 +777,6 @@ int unit_file_link(
                                         add_file_change(changes, n_changes, UNIT_FILE_UNLINK, path, NULL);
                                         add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, path, *i);
 
-                                        free(path);
                                         continue;
                                 }
                         }
@@ -837,14 +787,8 @@ int unit_file_link(
                         if (r == 0)
                                 r = -errno;
                 }
-
-                free(path);
         }
 
-                finish:
-        lookup_paths_free(&paths);
-        free(config_path);
-
         return r;
 }
 
@@ -975,15 +919,15 @@ static int install_info_add_auto(
                 return install_info_add(c, name_or_path, NULL);
 }
 
-static int config_parse_also(
-                const char *filename,
-                unsigned line,
-                const char *section,
-                const char *lvalue,
-                int ltype,
-                const char *rvalue,
-                void *data,
-                void *userdata) {
+static int config_parse_also(const char *unit,
+                             const char *filename,
+                             unsigned line,
+                             const char *section,
+                             const char *lvalue,
+                             int ltype,
+                             const char *rvalue,
+                             void *data,
+                             void *userdata) {
 
         char *w;
         size_t l;
@@ -995,7 +939,7 @@ static int config_parse_also(
         assert(rvalue);
 
         FOREACH_WORD_QUOTED(w, l, rvalue, state) {
-                char *n;
+                _cleanup_free_ char *n;
                 int r;
 
                 n = strndup(w, l);
@@ -1003,17 +947,40 @@ static int config_parse_also(
                         return -ENOMEM;
 
                 r = install_info_add(c, n, NULL);
-                if (r < 0) {
-                        free(n);
+                if (r < 0)
                         return r;
-                }
-
-                free(n);
         }
 
         return 0;
 }
 
+static int config_parse_user(const char *unit,
+                             const char *filename,
+                             unsigned line,
+                             const char *section,
+                             const char *lvalue,
+                             int ltype,
+                             const char *rvalue,
+                             void *data,
+                             void *userdata) {
+
+        InstallInfo *i = data;
+        char* printed;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+
+        printed = install_full_printf(i, rvalue);
+        if (!printed)
+                return -ENOMEM;
+
+        free(i->user);
+        i->user = printed;
+
+        return 0;
+}
+
 static int unit_file_load(
                 InstallContext *c,
                 InstallInfo *info,
@@ -1025,11 +992,12 @@ static int unit_file_load(
                 { "Install", "WantedBy",   config_parse_strv, 0, &info->wanted_by   },
                 { "Install", "RequiredBy", config_parse_strv, 0, &info->required_by },
                 { "Install", "Also",       config_parse_also, 0, c                  },
+                { "Exec",    "User",       config_parse_user, 0, info               },
                 { NULL, NULL, NULL, 0, NULL }
         };
 
         int fd;
-        FILE *f;
+        _cleanup_fclose_ FILE *f = NULL;
         int r;
 
         assert(c);
@@ -1046,8 +1014,8 @@ static int unit_file_load(
                 return -ENOMEM;
         }
 
-        r = config_parse(path, f, NULL, config_item_table_lookup, (void*) items, true, info);
-        fclose(f);
+        r = config_parse(NULL, path, f, NULL,
+                         config_item_table_lookup, (void*) items, true, true, info);
         if (r < 0)
                 return r;
 
@@ -1147,15 +1115,13 @@ static int unit_file_can_install(
                 const char *name,
                 bool allow_symlink) {
 
-        InstallContext c;
+        _cleanup_install_context_done_ InstallContext c = {};
         InstallInfo *i;
         int r;
 
         assert(paths);
         assert(name);
 
-        zero(c);
-
         r = install_info_add_auto(&c, name);
         if (r < 0)
                 return r;
@@ -1170,8 +1136,6 @@ static int unit_file_can_install(
                         strv_length(i->wanted_by) +
                         strv_length(i->required_by);
 
-        install_context_done(&c);
-
         return r;
 }
 
@@ -1182,7 +1146,7 @@ static int create_symlink(
                 UnitFileChange **changes,
                 unsigned *n_changes) {
 
-        char *dest;
+        _cleanup_free_ char *dest = NULL;
         int r;
 
         assert(old_path);
@@ -1202,12 +1166,8 @@ static int create_symlink(
         if (r < 0)
                 return r;
 
-        if (path_equal(dest, old_path)) {
-                free(dest);
+        if (path_equal(dest, old_path))
                 return 0;
-        }
-
-        free(dest);
 
         if (!force)
                 return -EEXIST;
@@ -1237,16 +1197,17 @@ static int install_info_symlink_alias(
         assert(config_path);
 
         STRV_FOREACH(s, i->aliases) {
-                char *alias_path;
+                _cleanup_free_ char *alias_path = NULL, *dst = NULL;
 
-                alias_path = path_make_absolute(*s, config_path);
+                dst = install_full_printf(i, *s);
+                if (!dst)
+                        return -ENOMEM;
 
+                alias_path = path_make_absolute(dst, config_path);
                 if (!alias_path)
                         return -ENOMEM;
 
                 q = create_symlink(i->path, alias_path, force, changes, n_changes);
-                free(alias_path);
-
                 if (r == 0)
                         r = q;
         }
@@ -1268,18 +1229,21 @@ static int install_info_symlink_wants(
         assert(config_path);
 
         STRV_FOREACH(s, i->wanted_by) {
-                char *path;
+                _cleanup_free_ char *path = NULL, *dst = NULL;
+
+                dst = install_full_printf(i, *s);
+                if (!dst)
+                        return -ENOMEM;
 
-                if (!unit_name_is_valid(*s, true)) {
+                if (!unit_name_is_valid(dst, true)) {
                         r = -EINVAL;
                         continue;
                 }
 
-                if (asprintf(&path, "%s/%s.wants/%s", config_path, *s, i->name) < 0)
+                if (asprintf(&path, "%s/%s.wants/%s", config_path, dst, i->name) < 0)
                         return -ENOMEM;
 
                 q = create_symlink(i->path, path, force, changes, n_changes);
-                free(path);
 
                 if (r == 0)
                         r = q;
@@ -1302,18 +1266,21 @@ static int install_info_symlink_requires(
         assert(config_path);
 
         STRV_FOREACH(s, i->required_by) {
-                char *path;
+                _cleanup_free_ char *path = NULL, *dst = NULL;
+
+                dst = install_full_printf(i, *s);
+                if (!dst)
+                        return -ENOMEM;
 
-                if (!unit_name_is_valid(*s, true)) {
+                if (!unit_name_is_valid(dst, true)) {
                         r = -EINVAL;
                         continue;
                 }
 
-                if (asprintf(&path, "%s/%s.requires/%s", config_path, *s, i->name) < 0)
+                if (asprintf(&path, "%s/%s.requires/%s", config_path, dst, i->name) < 0)
                         return -ENOMEM;
 
                 q = create_symlink(i->path, path, force, changes, n_changes);
-                free(path);
 
                 if (r == 0)
                         r = q;
@@ -1331,7 +1298,7 @@ static int install_info_symlink_link(
                 unsigned *n_changes) {
 
         int r;
-        char *path;
+        _cleanup_free_ char *path = NULL;
 
         assert(i);
         assert(paths);
@@ -1346,8 +1313,6 @@ static int install_info_symlink_link(
                 return -ENOMEM;
 
         r = create_symlink(i->path, path, force, changes, n_changes);
-        free(path);
-
         return r;
 }
 
@@ -1486,42 +1451,34 @@ int unit_file_enable(
                 UnitFileChange **changes,
                 unsigned *n_changes) {
 
-        LookupPaths paths;
-        InstallContext c;
-        char **i, *config_path = NULL;
+        _cleanup_lookup_paths_free_ LookupPaths paths = {};
+        _cleanup_install_context_done_ InstallContext c = {};
+        char **i;
+        _cleanup_free_ char *config_path = NULL;
         int r;
 
         assert(scope >= 0);
         assert(scope < _UNIT_FILE_SCOPE_MAX);
 
-        zero(paths);
-        zero(c);
-
         r = lookup_paths_init_from_scope(&paths, scope);
         if (r < 0)
                 return r;
 
         r = get_config_path(scope, runtime, root_dir, &config_path);
         if (r < 0)
-                goto finish;
+                return r;
 
         STRV_FOREACH(i, files) {
                 r = install_info_add_auto(&c, *i);
                 if (r < 0)
-                        goto finish;
+                        return r;
         }
 
         /* This will return the number of symlink rules that were
         supposed to be created, not the ones actually created. This is
-        useful to determine whether the passed files hat any
+        useful to determine whether the passed files had any
         installation data at all. */
         r = install_context_apply(&c, &paths, config_path, root_dir, force, changes, n_changes);
-
-finish:
-        install_context_done(&c);
-        lookup_paths_free(&paths);
-        free(config_path);
-
         return r;
 }
 
@@ -1533,30 +1490,28 @@ int unit_file_disable(
                 UnitFileChange **changes,
                 unsigned *n_changes) {
 
-        LookupPaths paths;
-        InstallContext c;
-        char **i, *config_path = NULL;
-        Set *remove_symlinks_to = NULL;
+        _cleanup_lookup_paths_free_ LookupPaths paths = {};
+        _cleanup_install_context_done_ InstallContext c = {};
+        char **i;
+        _cleanup_free_ char *config_path = NULL;
+        _cleanup_set_free_free_ Set *remove_symlinks_to = NULL;
         int r, q;
 
         assert(scope >= 0);
         assert(scope < _UNIT_FILE_SCOPE_MAX);
 
-        zero(paths);
-        zero(c);
-
         r = lookup_paths_init_from_scope(&paths, scope);
         if (r < 0)
                 return r;
 
         r = get_config_path(scope, runtime, root_dir, &config_path);
         if (r < 0)
-                goto finish;
+                return r;
 
         STRV_FOREACH(i, files) {
                 r = install_info_add_auto(&c, *i);
                 if (r < 0)
-                        goto finish;
+                        return r;
         }
 
         r = install_context_mark_for_removal(&c, &paths, &remove_symlinks_to, config_path, root_dir);
@@ -1565,12 +1520,6 @@ int unit_file_disable(
         if (r == 0)
                 r = q;
 
-finish:
-        install_context_done(&c);
-        lookup_paths_free(&paths);
-        set_free_free(remove_symlinks_to);
-        free(config_path);
-
         return r;
 }
 
@@ -1583,34 +1532,32 @@ int unit_file_reenable(
                 UnitFileChange **changes,
                 unsigned *n_changes) {
 
-        LookupPaths paths;
-        InstallContext c;
-        char **i, *config_path = NULL;
-        Set *remove_symlinks_to = NULL;
+        _cleanup_lookup_paths_free_ LookupPaths paths = {};
+        _cleanup_install_context_done_ InstallContext c = {};
+        char **i;
+        _cleanup_free_ char *config_path = NULL;
+        _cleanup_set_free_free_ Set *remove_symlinks_to = NULL;
         int r, q;
 
         assert(scope >= 0);
         assert(scope < _UNIT_FILE_SCOPE_MAX);
 
-        zero(paths);
-        zero(c);
-
         r = lookup_paths_init_from_scope(&paths, scope);
         if (r < 0)
                 return r;
 
         r = get_config_path(scope, runtime, root_dir, &config_path);
         if (r < 0)
-                goto finish;
+                return r;
 
         STRV_FOREACH(i, files) {
                 r = mark_symlink_for_removal(&remove_symlinks_to, *i);
                 if (r < 0)
-                        goto finish;
+                        return r;
 
                 r = install_info_add_auto(&c, *i);
                 if (r < 0)
-                        goto finish;
+                        return r;
         }
 
         r = remove_marked_symlinks(remove_symlinks_to, config_path, changes, n_changes, files);
@@ -1620,31 +1567,110 @@ int unit_file_reenable(
         if (r == 0)
                 r = q;
 
-finish:
-        lookup_paths_free(&paths);
-        install_context_done(&c);
-        set_free_free(remove_symlinks_to);
-        free(config_path);
-
         return r;
 }
 
+int unit_file_set_default(
+                UnitFileScope scope,
+                const char *root_dir,
+                char *file,
+                UnitFileChange **changes,
+                unsigned *n_changes) {
+
+        _cleanup_lookup_paths_free_ LookupPaths paths = {};
+        _cleanup_install_context_done_ InstallContext c = {};
+        _cleanup_free_ char *config_path = NULL;
+        char *path;
+        int r;
+        InstallInfo *i = NULL;
+
+        assert(scope >= 0);
+        assert(scope < _UNIT_FILE_SCOPE_MAX);
+
+        if (unit_name_to_type(file) != UNIT_TARGET)
+                return -EINVAL;
+
+        r = lookup_paths_init_from_scope(&paths, scope);
+        if (r < 0)
+                return r;
+
+        r = get_config_path(scope, false, root_dir, &config_path);
+        if (r < 0)
+                return r;
+
+        r = install_info_add_auto(&c, file);
+        if (r < 0)
+                return r;
+
+        i = (InstallInfo*)hashmap_first(c.will_install);
+
+        r = unit_file_search(&c, i, &paths, root_dir, false);
+        if (r < 0)
+                return r;
+
+        path = strappenda(config_path, "/default.target");
+        r = create_symlink(i->path, path, true, changes, n_changes);
+        if (r < 0)
+                return r;
+
+        return 0;
+}
+
+int unit_file_get_default(
+                UnitFileScope scope,
+                const char *root_dir,
+                char **name) {
+
+        _cleanup_lookup_paths_free_ LookupPaths paths = {};
+        char **p;
+        int r;
+
+        r = lookup_paths_init_from_scope(&paths, scope);
+        if (r < 0)
+                return r;
+
+        STRV_FOREACH(p, paths.unit_path) {
+                _cleanup_free_ char *path = NULL, *tmp = NULL;
+
+                if (isempty(root_dir))
+                        path = strappend(*p, "/default.target");
+                else
+                        path = strjoin(root_dir, "/", *p, "/default.target", NULL);
+
+                if (!path)
+                        return -ENOMEM;
+
+                r = readlink_malloc(path, &tmp);
+                if (r == -ENOENT)
+                        continue;
+                else if (r < 0)
+                        return r;
+
+                *name = strdup(path_get_file_name(tmp));
+                if (!*name)
+                        return -ENOMEM;
+
+                return 0;
+        }
+
+        return -ENOENT;
+}
+
 UnitFileState unit_file_get_state(
                 UnitFileScope scope,
                 const char *root_dir,
                 const char *name) {
 
-        LookupPaths paths;
+        _cleanup_lookup_paths_free_ LookupPaths paths = {};
         UnitFileState state = _UNIT_FILE_STATE_INVALID;
-        char **i, *path = NULL;
+        char **i;
+        _cleanup_free_ char *path = NULL;
         int r;
 
         assert(scope >= 0);
         assert(scope < _UNIT_FILE_SCOPE_MAX);
         assert(name);
 
-        zero(paths);
-
         if (root_dir && scope != UNIT_FILE_SYSTEM)
                 return -EINVAL;
 
@@ -1666,65 +1692,55 @@ UnitFileState unit_file_get_state(
                 else
                         asprintf(&path, "%s/%s", *i, name);
 
-                if (!path) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
+                if (!path)
+                        return -ENOMEM;
 
+                /*
+                 * Search for a unit file in our default paths, to
+                 * be sure, that there are no broken symlinks.
+                 */
                 if (lstat(path, &st) < 0) {
                         r = -errno;
-                        if (errno == ENOENT)
-                                continue;
-
-                        goto finish;
-                }
+                        if (errno != ENOENT)
+                                return r;
 
-                if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode)) {
-                        r = -ENOENT;
-                        goto finish;
-                }
-
-                r = null_or_empty_path(path);
-                if (r < 0 && r != -ENOENT)
-                        goto finish;
-                else if (r > 0) {
-                        state = path_startswith(*i, "/run") ?
-                                UNIT_FILE_MASKED_RUNTIME : UNIT_FILE_MASKED;
-                        r = 0;
-                        goto finish;
+                        if (!unit_name_is_instance(name))
+                                continue;
+                } else {
+                        if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode))
+                                return -ENOENT;
+
+                        r = null_or_empty_path(path);
+                        if (r < 0 && r != -ENOENT)
+                                return r;
+                        else if (r > 0) {
+                                state = path_startswith(*i, "/run") ?
+                                        UNIT_FILE_MASKED_RUNTIME : UNIT_FILE_MASKED;
+                                return state;
+                        }
                 }
 
                 r = find_symlinks_in_scope(scope, root_dir, name, &state);
-                if (r < 0) {
-                        goto finish;
-                } else if (r > 0) {
-                        r = 0;
-                        goto finish;
-                }
+                if (r < 0)
+                        return r;
+                else if (r > 0)
+                        return state;
 
                 r = unit_file_can_install(&paths, root_dir, path, true);
-                if (r < 0 && errno != -ENOENT)
-                        goto finish;
-                else if (r > 0) {
-                        state = UNIT_FILE_DISABLED;
-                        r = 0;
-                        goto finish;
-                } else if (r == 0) {
-                        state = UNIT_FILE_STATIC;
-                        r = 0;
-                        goto finish;
-                }
+                if (r < 0 && errno != ENOENT)
+                        return r;
+                else if (r > 0)
+                        return UNIT_FILE_DISABLED;
+                else if (r == 0)
+                        return UNIT_FILE_STATIC;
         }
 
-finish:
-        lookup_paths_free(&paths);
-        free(path);
-
         return r < 0 ? r : state;
 }
 
 int unit_file_query_preset(UnitFileScope scope, const char *name) {
-        char **files, **i;
+        _cleanup_strv_free_ char **files = NULL;
+        char **i;
         int r;
 
         assert(scope >= 0);
@@ -1732,7 +1748,7 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) {
         assert(name);
 
         if (scope == UNIT_FILE_SYSTEM)
-                r = conf_files_list(&files, ".preset",
+                r = conf_files_list(&files, ".preset", NULL,
                                     "/etc/systemd/system-preset",
                                     "/usr/local/lib/systemd/system-preset",
                                     "/usr/lib/systemd/system-preset",
@@ -1741,7 +1757,7 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) {
 #endif
                                     NULL);
         else if (scope == UNIT_FILE_GLOBAL)
-                r = conf_files_list(&files, ".preset",
+                r = conf_files_list(&files, ".preset", NULL,
                                     "/etc/systemd/user-preset",
                                     "/usr/local/lib/systemd/user-preset",
                                     "/usr/lib/systemd/user-preset",
@@ -1753,15 +1769,14 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) {
                 return r;
 
         STRV_FOREACH(i, files) {
-                FILE *f;
+                _cleanup_fclose_ FILE *f;
 
                 f = fopen(*i, "re");
                 if (!f) {
                         if (errno == ENOENT)
                                 continue;
 
-                        r = -errno;
-                        goto finish;
+                        return -errno;
                 }
 
                 for (;;) {
@@ -1774,41 +1789,30 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) {
                         if (!*l)
                                 continue;
 
-                        if (strchr(COMMENTS, *l))
+                        if (strchr(COMMENTS "\n", *l))
                                 continue;
 
                         if (first_word(l, "enable")) {
                                 l += 6;
                                 l += strspn(l, WHITESPACE);
 
-                                if (fnmatch(l, name, FNM_NOESCAPE) == 0) {
-                                        r = 1;
-                                        fclose(f);
-                                        goto finish;
-                                }
+                                if (fnmatch(l, name, FNM_NOESCAPE) == 0)
+                                        return 1;
+
                         } else if (first_word(l, "disable")) {
                                 l += 7;
                                 l += strspn(l, WHITESPACE);
 
-                                if (fnmatch(l, name, FNM_NOESCAPE) == 0) {
-                                        r = 0;
-                                        fclose(f);
-                                        goto finish;
-                                }
+                                if (fnmatch(l, name, FNM_NOESCAPE) == 0)
+                                        return 0;
+
                         } else
                                 log_debug("Couldn't parse line '%s'", l);
                 }
-
-                fclose(f);
         }
 
         /* Default is "enable" */
-        r = 1;
-
-finish:
-        strv_free(files);
-
-        return r;
+        return 1;
 }
 
 int unit_file_preset(
@@ -1820,37 +1824,32 @@ int unit_file_preset(
                 UnitFileChange **changes,
                 unsigned *n_changes) {
 
-        LookupPaths paths;
-        InstallContext plus, minus;
-        char **i, *config_path = NULL;
-        Set *remove_symlinks_to = NULL;
+        _cleanup_lookup_paths_free_ LookupPaths paths = {};
+        _cleanup_install_context_done_ InstallContext plus = {}, minus = {};
+        char **i;
+        _cleanup_free_ char *config_path = NULL;
+        _cleanup_set_free_free_ Set *remove_symlinks_to = NULL;
         int r, q;
 
         assert(scope >= 0);
         assert(scope < _UNIT_FILE_SCOPE_MAX);
 
-        zero(paths);
-        zero(plus);
-        zero(minus);
-
         r = lookup_paths_init_from_scope(&paths, scope);
         if (r < 0)
                 return r;
 
         r = get_config_path(scope, runtime, root_dir, &config_path);
         if (r < 0)
-                goto finish;
+                return r;
 
         STRV_FOREACH(i, files) {
 
-                if (!unit_name_is_valid(*i, true)) {
-                        r = -EINVAL;
-                        goto finish;
-                }
+                if (!unit_name_is_valid(*i, true))
+                        return -EINVAL;
 
                 r = unit_file_query_preset(scope, *i);
                 if (r < 0)
-                        goto finish;
+                        return r;
 
                 if (r)
                         r = install_info_add_auto(&plus, *i);
@@ -1858,46 +1857,49 @@ int unit_file_preset(
                         r = install_info_add_auto(&minus, *i);
 
                 if (r < 0)
-                        goto finish;
+                        return r;
         }
 
-        r = install_context_mark_for_removal(&minus, &paths, &remove_symlinks_to, config_path, root_dir);
+        r = install_context_mark_for_removal(&minus, &paths, &remove_symlinks_to,
+                                             config_path, root_dir);
 
-        q = remove_marked_symlinks(remove_symlinks_to, config_path, changes, n_changes, files);
+        q = remove_marked_symlinks(remove_symlinks_to, config_path,
+                                   changes, n_changes, files);
         if (r == 0)
                 r = q;
 
         /* Returns number of symlinks that where supposed to be installed. */
-        q = install_context_apply(&plus, &paths, config_path, root_dir, force, changes, n_changes);
+        q = install_context_apply(&plus, &paths, config_path, root_dir, force,
+                                  changes, n_changes);
         if (r == 0)
                 r = q;
 
-finish:
-        lookup_paths_free(&paths);
-        install_context_done(&plus);
-        install_context_done(&minus);
-        set_free_free(remove_symlinks_to);
-        free(config_path);
-
         return r;
 }
 
+static void unitfilelist_free(UnitFileList **f) {
+        if (!*f)
+                return;
+
+        free((*f)->path);
+        free(*f);
+}
+
 int unit_file_get_list(
                 UnitFileScope scope,
                 const char *root_dir,
                 Hashmap *h) {
 
-        LookupPaths paths;
-        char **i, *buf = NULL;
-        DIR *d = NULL;
+        _cleanup_lookup_paths_free_ LookupPaths paths = {};
+        char **i;
+        _cleanup_free_ char *buf = NULL;
+        _cleanup_closedir_ DIR *d = NULL;
         int r;
 
         assert(scope >= 0);
         assert(scope < _UNIT_FILE_SCOPE_MAX);
         assert(h);
 
-        zero(paths);
-
         if (root_dir && scope != UNIT_FILE_SYSTEM)
                 return -EINVAL;
 
@@ -1906,17 +1908,15 @@ int unit_file_get_list(
                 return r;
 
         STRV_FOREACH(i, paths.unit_path) {
-                struct dirent buffer, *de;
                 const char *units_dir;
 
                 free(buf);
                 buf = NULL;
 
                 if (root_dir) {
-                        if (asprintf(&buf, "%s/%s", root_dir, *i) < 0) {
-                                r = -ENOMEM;
-                                goto finish;
-                        }
+                        if (asprintf(&buf, "%s/%s", root_dir, *i) < 0)
+                                return -ENOMEM;
+
                         units_dir = buf;
                 } else
                         units_dir = *i;
@@ -1929,18 +1929,18 @@ int unit_file_get_list(
                         if (errno == ENOENT)
                                 continue;
 
-                        r = -errno;
-                        goto finish;
+                        return -errno;
                 }
 
                 for (;;) {
-                        UnitFileList *f;
+                        struct dirent *de;
+                        union dirent_storage buffer;
+                        UnitFileList __attribute__((cleanup(unitfilelist_free)))
+                                *f = NULL;
 
-                        r = readdir_r(d, &buffer, &de);
-                        if (r != 0) {
-                                r = -r;
-                                goto finish;
-                        }
+                        r = readdir_r(d, &buffer.de, &de);
+                        if (r != 0)
+                                return -r;
 
                         if (!de)
                                 break;
@@ -1959,31 +1959,24 @@ int unit_file_get_list(
                                 if (r == -ENOENT)
                                         continue;
 
-                                goto finish;
+                                return r;
                         }
 
                         if (de->d_type != DT_LNK && de->d_type != DT_REG)
                                 continue;
 
                         f = new0(UnitFileList, 1);
-                        if (!f) {
-                                r = -ENOMEM;
-                                goto finish;
-                        }
+                        if (!f)
+                                return -ENOMEM;
 
                         f->path = path_make_absolute(de->d_name, units_dir);
-                        if (!f->path) {
-                                free(f);
-                                r = -ENOMEM;
-                                goto finish;
-                        }
+                        if (!f->path)
+                                return -ENOMEM;
 
                         r = null_or_empty_path(f->path);
-                        if (r < 0 && r != -ENOENT) {
-                                free(f->path);
-                                free(f);
-                                goto finish;
-                        } else if (r > 0) {
+                        if (r < 0 && r != -ENOENT)
+                                return r;
+                        else if (r > 0) {
                                 f->state =
                                         path_startswith(*i, "/run") ?
                                         UNIT_FILE_MASKED_RUNTIME : UNIT_FILE_MASKED;
@@ -1991,11 +1984,9 @@ int unit_file_get_list(
                         }
 
                         r = find_symlinks_in_scope(scope, root_dir, de->d_name, &f->state);
-                        if (r < 0) {
-                                free(f->path);
-                                free(f);
-                                goto finish;
-                        } else if (r > 0) {
+                        if (r < 0)
+                                return r;
+                        else if (r > 0) {
                                 f->state = UNIT_FILE_ENABLED;
                                 goto found;
                         }
@@ -2005,32 +1996,21 @@ int unit_file_get_list(
                             r == -EBADMSG || /* Invalid format? */
                             r == -ENOENT     /* Included file not found? */)
                                 f->state = UNIT_FILE_INVALID;
-                        else if (r < 0) {
-                                free(f->path);
-                                free(f);
-                                goto finish;
-                        } else if (r > 0)
+                        else if (r < 0)
+                                return r;
+                        else if (r > 0)
                                 f->state = UNIT_FILE_DISABLED;
                         else
                                 f->state = UNIT_FILE_STATIC;
 
                 found:
                         r = hashmap_put(h, path_get_file_name(f->path), f);
-                        if (r < 0) {
-                                free(f->path);
-                                free(f);
-                                goto finish;
-                        }
+                        if (r < 0)
+                                return r;
+                        f = NULL; /* prevent cleanup */
                 }
         }
 
-finish:
-        lookup_paths_free(&paths);
-        free(buf);
-
-        if (d)
-                closedir(d);
-
         return r;
 }