X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-util.c;h=0c1b6a0ab04240c672431035ad28ff551899b608;hb=68fee104e630eb19f04b8196a83c14c2c9c469e7;hp=4857971b33002f29b496f6292a380d742c069b28;hpb=874310b7b68c4c0d36ff07397db30a959bb7dae5;p=elogind.git

diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index 4857971b3..0c1b6a0ab 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -50,7 +50,8 @@ char *path_get_file_name(const char *p) {
 
         assert(p);
 
-        if ((r = strrchr(p, '/')))
+        r = strrchr(p, '/');
+        if (r)
                 return r + 1;
 
         return (char*) p;
@@ -135,7 +136,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 +192,6 @@ char **path_strv_canonicalize(char **l) {
 
                 errno = 0;
                 u = canonicalize_file_name(t);
-
                 if (!u) {
                         if (errno == ENOENT)
                                 u = t;
@@ -201,7 +202,8 @@ char **path_strv_canonicalize(char **l) {
 
                                 continue;
                         }
-                }
+                } else
+                        free(t);
 
                 l[k++] = u;
         }
@@ -214,24 +216,14 @@ char **path_strv_canonicalize(char **l) {
         return l;
 }
 
-char **path_strv_remove_empty(char **l) {
-        char **f, **t;
+char **path_strv_canonicalize_uniq(char **l) {
+        if (strv_isempty(l))
+                return l;
 
-        if (!l)
+        if (!path_strv_canonicalize(l))
                 return NULL;
 
-        for (f = t = l; *f; f++) {
-
-                if (dir_is_empty(*f) > 0) {
-                        free(*f);
-                        continue;
-                }
-
-                *(t++) = *f;
-        }
-
-        *t = NULL;
-        return l;
+        return strv_uniq(l);
 }
 
 char *path_kill_slashes(char *path) {
@@ -422,3 +414,15 @@ int path_is_read_only_fs(const char *path) {
 
         return !!(st.f_flag & ST_RDONLY);
 }
+
+int path_is_os_tree(const char *path) {
+        char *p;
+        int r;
+
+        /* We use /etc/os-release as flag file if something is an OS */
+
+        p = strappenda(path, "/etc/os-release");
+        r = access(p, F_OK);
+
+        return r < 0 ? 0 : 1;
+}