Prep v225: Applying various fixes and changes to src/basic that got lost during git...

[elogind.git] / src / basic / path-util.c

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 4325f55f236793faf6d523cc1277ef79fe32d487..6bdc8342e6807c9c749feb5aa2029942eadeeec9 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -665,9 +665,11 @@ int path_is_mount_point(const char *t, int flags) {
                 canonical = canonicalize_file_name(t);
                 if (!canonical)
                         return -errno;
                 canonical = canonicalize_file_name(t);
                 if (!canonical)
                         return -errno;

+
+                t = canonical;

         }
 
         }
 

-        r = path_get_parent(canonical ?: t, &parent);
+        r = path_get_parent(t, &parent);

         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 


@@ -675,7 +677,7 @@ int path_is_mount_point(const char *t, int flags) {
         if (fd < 0)
                 return -errno;
 
         if (fd < 0)
                 return -errno;
 

-        return fd_is_mount_point(fd, basename(canonical ?: t), flags);
+        return fd_is_mount_point(fd, basename(t), flags);

 }
 
 int path_is_read_only_fs(const char *path) {
 }
 
 int path_is_read_only_fs(const char *path) {