summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-02-09 16:58:56 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-02-09 16:58:56 +0900
commit01e4793de62743247398be71285797c1bb61bc24 (patch)
tree5423d8ecbb4e6e57fed02e34e8c6cc481b167c6d
parent842e456e7958a79534d998f6d4bed2b7a69b9762 (diff)
downloadsystemd-01e4793de62743247398be71285797c1bb61bc24.tar.gz
fs-util: drop readlink_and_make_absolute_root()
-rw-r--r--src/basic/fs-util.c20
-rw-r--r--src/basic/fs-util.h1
2 files changed, 0 insertions, 21 deletions
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index bedde41389..cf856ae8e2 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -225,26 +225,6 @@ int readlink_and_make_absolute(const char *p, char **r) {
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;
- int r;
-
- full = prefix_roota(root, path);
- r = readlink_malloc(full, &target);
- if (r < 0)
- return r;
-
- t = file_in_same_dir(path, target);
- if (!t)
- return -ENOMEM;
-
- *ret = t;
- t = NULL;
-
- return 0;
-}
-
int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid) {
assert(path);
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index c4b81858fd..6df3ebffe2 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_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);