X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-util.c;h=ae12c05317f4d34a4f3ae74a52afa46ac3f38e07;hb=1f28b2deb4e118cd2d2a5138ccb4cc45841c136d;hp=97a200504ba80f61e9e745b5aab6390bf4996070;hpb=8ac7549330c774b8ca04034c1303165fe6a920b0;p=elogind.git

diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index 97a200504..ae12c0531 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -181,6 +181,7 @@ char **path_strv_canonicalize(char **l) {
 
                 t = path_make_absolute_cwd(*s);
                 free(*s);
+                *s = NULL;
 
                 if (!t) {
                         enomem = true;
@@ -189,13 +190,17 @@ char **path_strv_canonicalize(char **l) {
 
                 errno = 0;
                 u = canonicalize_file_name(t);
-                free(t);
 
                 if (!u) {
-                        if (errno == ENOMEM || !errno)
-                                enomem = true;
-
-                        continue;
+                        if (errno == ENOENT)
+                                u = t;
+                        else {
+                                free(t);
+                                if (errno == ENOMEM || !errno)
+                                        enomem = true;
+
+                                continue;
+                        }
                 }
 
                 l[k++] = u;
@@ -209,26 +214,6 @@ char **path_strv_canonicalize(char **l) {
         return l;
 }
 
-char **path_strv_remove_empty(char **l) {
-        char **f, **t;
-
-        if (!l)
-                return NULL;
-
-        for (f = t = l; *f; f++) {
-
-                if (dir_is_empty(*f) > 0) {
-                        free(*f);
-                        continue;
-                }
-
-                *(t++) = *f;
-        }
-
-        *t = NULL;
-        return l;
-}
-
 char *path_kill_slashes(char *path) {
         char *f, *t;
         bool slash = false;
@@ -264,12 +249,12 @@ char *path_kill_slashes(char *path) {
         return path;
 }
 
-bool path_startswith(const char *path, const char *prefix) {
+char* path_startswith(const char *path, const char *prefix) {
         assert(path);
         assert(prefix);
 
         if ((path[0] == '/') != (prefix[0] == '/'))
-                return false;
+                return NULL;
 
         for (;;) {
                 size_t a, b;
@@ -278,19 +263,19 @@ bool path_startswith(const char *path, const char *prefix) {
                 prefix += strspn(prefix, "/");
 
                 if (*prefix == 0)
-                        return true;
+                        return (char*) path;
 
                 if (*path == 0)
-                        return false;
+                        return NULL;
 
                 a = strcspn(path, "/");
                 b = strcspn(prefix, "/");
 
                 if (a != b)
-                        return false;
+                        return NULL;
 
                 if (memcmp(path, prefix, a) != 0)
-                        return false;
+                        return NULL;
 
                 path += a;
                 prefix += b;
@@ -349,8 +334,8 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
 
         r = name_to_handle_at(AT_FDCWD, t, h, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
         if (r < 0) {
-                if (errno == ENOTSUP)
-                        /* This file system does not support
+                if (errno == ENOSYS || errno == ENOTSUP)
+                        /* This kernel or file system does not support
                          * name_to_handle_at(), hence fallback to the
                          * traditional stat() logic */
                         goto fallback;