X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-util.c;h=0b50ea646aa984a3a1a64b15946f438ac17527e1;hb=9f26c90cb50c45d4549c4dd569917b4ac143b94d;hp=ae12c05317f4d34a4f3ae74a52afa46ac3f38e07;hpb=0783951b931cb2743a43cbfdc37babd76fedd2fe;p=elogind.git

diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index ae12c0531..0b50ea646 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -135,7 +135,8 @@ char *path_make_absolute_cwd(const char *p) {
         if (path_is_absolute(p))
                 return strdup(p);
 
-        if (!(cwd = get_current_dir_name()))
+        cwd = get_current_dir_name();
+        if (!cwd)
                 return NULL;
 
         r = path_make_absolute(p, cwd);
@@ -190,7 +191,6 @@ char **path_strv_canonicalize(char **l) {
 
                 errno = 0;
                 u = canonicalize_file_name(t);
-
                 if (!u) {
                         if (errno == ENOENT)
                                 u = t;
@@ -201,7 +201,8 @@ char **path_strv_canonicalize(char **l) {
 
                                 continue;
                         }
-                }
+                } else
+                        free(t);
 
                 l[k++] = u;
         }
@@ -214,6 +215,16 @@ char **path_strv_canonicalize(char **l) {
         return l;
 }
 
+char **path_strv_canonicalize_uniq(char **l) {
+        if (strv_isempty(l))
+                return l;
+
+        if (!path_strv_canonicalize(l))
+                return NULL;
+
+        return strv_uniq(l);
+}
+
 char *path_kill_slashes(char *path) {
         char *f, *t;
         bool slash = false;