mirror of
https://github.com/systemd/systemd.git
synced 2024-10-31 16:21:26 +03:00
fs-util: drop readlink_and_make_absolute_root()
This commit is contained in:
parent
842e456e79
commit
01e4793de6
@ -225,26 +225,6 @@ int readlink_and_make_absolute(const char *p, char **r) {
|
|||||||
return 0;
|
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) {
|
int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid) {
|
||||||
assert(path);
|
assert(path);
|
||||||
|
|
||||||
|
@ -41,7 +41,6 @@ int readlinkat_malloc(int fd, const char *p, char **ret);
|
|||||||
int readlink_malloc(const char *p, char **r);
|
int readlink_malloc(const char *p, char **r);
|
||||||
int readlink_value(const char *p, char **ret);
|
int readlink_value(const char *p, char **ret);
|
||||||
int readlink_and_make_absolute(const char *p, char **r);
|
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);
|
int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user