X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fpath-lookup.c;h=63af43cdbb0de55542e54e54b88f0321a5d8bb70;hp=6bb390fc9056b72255838934f4cdf8e181189424;hb=4de33e7f3238a6fe616e61139ab87e221572e5e5;hpb=242c4e1cc4d6419043729904d7dd88b2b1283556

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 6bb390fc9..63af43cdb 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -90,9 +90,9 @@ static char** user_dirs(
         };
 
         const char *home, *e;
-        char *config_home = NULL, *data_home = NULL;
-        char **config_dirs = NULL, **data_dirs = NULL;
-        char **r = NULL, **t;
+        _cleanup_free_ char *config_home = NULL, *data_home = NULL;
+        _cleanup_strv_free_ char **config_dirs = NULL, **data_dirs = NULL;
+        char **r = NULL;
 
         /* Implement the mechanisms defined in
          *
@@ -150,89 +150,48 @@ static char** user_dirs(
                 goto fail;
 
         /* Now merge everything we found. */
-        if (generator_early) {
-                t = strv_append(r, generator_early);
-                if (!t)
+        if (generator_early)
+                if (strv_extend(&r, generator_early) < 0)
                         goto fail;
-                strv_free(r);
-                r = t;
-        }
 
-        if (config_home) {
-                t = strv_append(r, config_home);
-                if (!t)
+        if (config_home)
+                if (strv_extend(&r, config_home) < 0)
                         goto fail;
-                strv_free(r);
-                r = t;
-        }
 
-        if (!strv_isempty(config_dirs)) {
-                t = strv_merge_concat(r, config_dirs, "/systemd/user");
-                if (!t)
-                        goto finish;
-                strv_free(r);
-                r = t;
-        }
+        if (!strv_isempty(config_dirs))
+                if (strv_extend_strv_concat(&r, config_dirs, "/systemd/user") < 0)
+                        goto fail;
 
-        t = strv_merge(r, (char**) config_unit_paths);
-        if (!t)
+        if (strv_extend_strv(&r, (char**) config_unit_paths) < 0)
                 goto fail;
-        strv_free(r);
-        r = t;
 
-        if (generator) {
-                t = strv_append(r, generator);
-                if (!t)
+        if (generator)
+                if (strv_extend(&r, generator) < 0)
                         goto fail;
-                strv_free(r);
-                r = t;
-        }
 
-        if (data_home) {
-                t = strv_append(r, data_home);
-                if (!t)
+        if (data_home)
+                if (strv_extend(&r, data_home) < 0)
                         goto fail;
-                strv_free(r);
-                r = t;
-        }
 
-        if (!strv_isempty(data_dirs)) {
-                t = strv_merge_concat(r, data_dirs, "/systemd/user");
-                if (!t)
+        if (!strv_isempty(data_dirs))
+                if (strv_extend_strv_concat(&r, data_dirs, "/systemd/user") < 0)
                         goto fail;
-                strv_free(r);
-                r = t;
-        }
 
-        t = strv_merge(r, (char**) data_unit_paths);
-        if (!t)
+        if (strv_extend_strv(&r, (char**) data_unit_paths) < 0)
                 goto fail;
-        strv_free(r);
-        r = t;
 
-        if (generator_late) {
-                t = strv_append(r, generator_late);
-                if (!t)
+        if (generator_late)
+                if (strv_extend(&r, generator_late) < 0)
                         goto fail;
-                strv_free(r);
-                r = t;
-        }
 
         if (!path_strv_make_absolute_cwd(r))
                 goto fail;
 
-finish:
-        free(config_home);
-        strv_free(config_dirs);
-        free(data_home);
-        strv_free(data_dirs);
-
         return r;
 
 fail:
         strv_free(r);
-        r = NULL;
-        goto finish;
+        return NULL;
 }
 
 int lookup_paths_init(
@@ -316,13 +275,13 @@ int lookup_paths_init(
                 }
         }
 
-        if (!path_strv_canonicalize(p->unit_path))
+        if (!path_strv_canonicalize_absolute(p->unit_path, NULL))
                 return -ENOMEM;
 
         strv_uniq(p->unit_path);
 
         if (!strv_isempty(p->unit_path)) {
-                char _cleanup_free_ *t = strv_join(p->unit_path, "\n\t");
+                _cleanup_free_ char *t = strv_join(p->unit_path, "\n\t");
                 if (!t)
                         return -ENOMEM;
                 log_debug("Looking for unit files in (higher priority first):\n\t%s", t);
@@ -372,17 +331,17 @@ int lookup_paths_init(
                                 return -ENOMEM;
                 }
 
-                if (!path_strv_canonicalize(p->sysvinit_path))
+                if (!path_strv_canonicalize_absolute(p->sysvinit_path, NULL))
                         return -ENOMEM;
 
-                if (!path_strv_canonicalize(p->sysvrcnd_path))
+                if (!path_strv_canonicalize_absolute(p->sysvrcnd_path, NULL))
                         return -ENOMEM;
 
                 strv_uniq(p->sysvinit_path);
                 strv_uniq(p->sysvrcnd_path);
 
                 if (!strv_isempty(p->sysvinit_path)) {
-                        char _cleanup_free_ *t = strv_join(p->sysvinit_path, "\n\t");
+                        _cleanup_free_ char *t = strv_join(p->sysvinit_path, "\n\t");
                         if (!t)
                                 return -ENOMEM;
                         log_debug("Looking for SysV init scripts in:\n\t%s", t);
@@ -393,7 +352,7 @@ int lookup_paths_init(
                 }
 
                 if (!strv_isempty(p->sysvrcnd_path)) {
-                        char _cleanup_free_ *t =
+                        _cleanup_free_ char *t =
                                 strv_join(p->sysvrcnd_path, "\n\t");
                         if (!t)
                                 return -ENOMEM;