From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 17 Jan 2018 10:15:00 +0000 (+0100)
Subject: path-util: don't add extra "/" when prefix already is suffixed by slash
X-Git-Tag: v237~86^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cddd2ce1069c4d84179ce606e830db98abc50609;p=thirdparty%2Fsystemd.git

path-util: don't add extra "/" when prefix already is suffixed by slash

No need to insert duplicate "/" if we can avoid it. This is particularly
relevant if the prefix passed in is the root directory.
---

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index b877bdc1cbe..f5f506ccf57 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -84,7 +84,10 @@ char *path_make_absolute(const char *p, const char *prefix) {
         if (path_is_absolute(p) || isempty(prefix))
                 return strdup(p);
 
-        return strjoin(prefix, "/", p);
+        if (endswith(prefix, "/"))
+                return strjoin(prefix, p);
+        else
+                return strjoin(prefix, "/", p);
 }
 
 int path_make_absolute_cwd(const char *p, char **ret) {