From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 4 Oct 2017 15:34:03 +0000 (+0200)
Subject: fs-util: small tweak in chase_symlinks()
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=be1d8c84ebe7d240e06df26176ac98d91b37fd79;p=elogind.git

fs-util: small tweak in chase_symlinks()

If we follow an absolute symlink there's no need to prefix the path with
a "/", since by definition it already has one.

This helps suppressing double "/" in resolved paths containing absolute
symlinks.
---

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 28b2dce33..d63eeb1d2 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -781,12 +781,11 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
                                                 return -ENOMEM;
                                 }
 
-                        }
-
-                        /* Prefix what's left to do with what we just read, and start the loop again,
-                         * but remain in the current directory. */
-
-                        joined = strjoin("/", destination, todo);
+                                /* Prefix what's left to do with what we just read, and start the loop again, but
+                                 * remain in the current directory. */
+                                joined = strjoin(destination, todo);
+                        } else
+                                joined = strjoin("/", destination, todo);
                         if (!joined)
                                 return -ENOMEM;