From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 19 Jan 2018 09:05:28 +0000 (+0900)
Subject: fs-util: chase_symlinks(): support empty root
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=35078962d59391fba6e42c9f6675adff25b5e34b;p=elogind.git

fs-util: chase_symlinks(): support empty root

The commit b1bfb848046e457f3cd623286b8cc1a5e5440023 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.
---

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index bd7e3db64..07aeff0af 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -675,13 +675,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);