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 b877bdc1cbee1a07f515e4b2f7b6a896a7bafb18..f5f506ccf577f4e794866243caffbec2255b73e9 100644 (file)
--- 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) {