From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 9 Feb 2018 07:49:54 +0000 (+0900)
Subject: fs-util: drop readlink_and_canonicalize()
X-Git-Tag: v238~115^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=842e456e7958a79534d998f6d4bed2b7a69b9762;p=thirdparty%2Fsystemd.git

fs-util: drop readlink_and_canonicalize()
---

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index a8e50d4c785..bedde413896 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -225,29 +225,6 @@ int readlink_and_make_absolute(const char *p, char **r) {
         return 0;
 }
 
-int readlink_and_canonicalize(const char *p, const char *root, char **ret) {
-        char *t, *s;
-        int r;
-
-        assert(p);
-        assert(ret);
-
-        r = readlink_and_make_absolute(p, &t);
-        if (r < 0)
-                return r;
-
-        r = chase_symlinks(t, root, 0, &s);
-        if (r < 0)
-                /* If we can't follow up, then let's return the original string, slightly cleaned up. */
-                *ret = path_kill_slashes(t);
-        else {
-                *ret = s;
-                free(t);
-        }
-
-        return 0;
-}
-
 int readlink_and_make_absolute_root(const char *root, const char *path, char **ret) {
         _cleanup_free_ char *target = NULL, *t = NULL;
         const char *full;
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index 4dba1ea56ad..c4b81858fdc 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -41,7 +41,6 @@ int readlinkat_malloc(int fd, const char *p, char **ret);
 int readlink_malloc(const char *p, char **r);
 int readlink_value(const char *p, char **ret);
 int readlink_and_make_absolute(const char *p, char **r);
-int readlink_and_canonicalize(const char *p, const char *root, char **r);
 int readlink_and_make_absolute_root(const char *root, const char *path, char **ret);
 
 int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);
diff --git a/src/test/test-copy.c b/src/test/test-copy.c
index d277b78c5b3..1dde878a9e8 100644
--- a/src/test/test-copy.c
+++ b/src/test/test-copy.c
@@ -146,7 +146,7 @@ static void test_copy_tree(void) {
                 assert_se((f = strjoin(original_dir, *p)));
                 assert_se((l = strjoin(copy_dir, *link)));
 
-                assert_se(readlink_and_canonicalize(l, NULL, &target) == 0);
+                assert_se(chase_symlinks(l, NULL, 0, &target) == 1);
                 assert_se(path_equal(f, target));
         }