X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fpath-util.c;h=6bdc8342e6807c9c749feb5aa2029942eadeeec9;hp=4325f55f236793faf6d523cc1277ef79fe32d487;hb=21ecddbbb2c9e06d080b2526a870898a8b90f52a;hpb=54ce5835917e44761df5c7071fa9111f5be4008a diff --git a/src/basic/path-util.c b/src/basic/path-util.c index 4325f55f2..6bdc8342e 100644 --- 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; + + t = canonical; } - r = path_get_parent(canonical ?: t, &parent); + r = path_get_parent(t, &parent); if (r < 0) return r; @@ -675,7 +677,7 @@ int path_is_mount_point(const char *t, int flags) { 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) {