Add fallback for kcmp() in case __NR_kcmp is undefined

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

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 4325f55f236793faf6d523cc1277ef79fe32d487..238252eebfb2f228100a8ec432ff8881ed81196e 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;
+
+                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) {
@@ -717,7 +719,6 @@ int path_is_os_tree(const char *path) {
 
         return r >= 0;
 }
-#endif // 0
 
 int find_binary(const char *name, bool local, char **filename) {
         assert(name);
@@ -771,8 +772,6 @@ int find_binary(const char *name, bool local, char **filename) {
         }
 }
 
-/// UNNEEDED by elogind
-#if 0
 bool paths_check_timestamp(const char* const* paths, usec_t *timestamp, bool update) {
         bool changed = false;
         const char* const* i;
@@ -831,7 +830,6 @@ int fsck_exists(const char *fstype) {
 
         return 0;
 }
-#endif // 0
 
 char *prefix_root(const char *root, const char *path) {
         char *n, *p;
@@ -866,3 +864,4 @@ char *prefix_root(const char *root, const char *path) {
         strcpy(p, path);
         return n;
 }
+#endif // 0