picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fs-util: chase_symlinks(): support empty root 

The commit b1bfb84804 makes chase_symlinks()
recognize empty string for root as an invalid parameter. However,
empty root is often used e.g. systemd-nspawn.
This makes chase_symlinks() support empty string safely.

Fixes #7927.
This commit is contained in:
Yu Watanabe 2018-01-19 18:05:28 +09:00 committed by Lennart Poettering
parent 8f2e968659
commit 22bc57c58a
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/basic/fs-util.c
View File

@ -660,13 +660,9 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
* function what to do when encountering a symlink with an absolute path as directory: prefix it by the
* specified path. */
if (original_root) {
if (isempty(original_root)) /* What's this even supposed to mean? */
return -EINVAL;
if (path_equal(original_root, "/")) /* A root directory of "/" is identical to none */
original_root = NULL;
}
/* A root directory of "/" or "" is identical to none */
if (isempty(original_root) || path_equal(original_root, "/"))
original_root = NULL;
if (original_root) {
r = path_make_absolute_cwd(original_root, &root);