diff options
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/path-util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/path-util.c b/src/shared/path-util.c index b3fe0b8179..dcc8321f50 100644 --- a/src/shared/path-util.c +++ b/src/shared/path-util.c @@ -439,14 +439,14 @@ char* path_join(const char *root, const char *path, const char *rest) { assert(path); if (!isempty(root)) - return strjoin(root, "/", + return strjoin(root, endswith(root, "/") ? "" : "/", path[0] == '/' ? path+1 : path, - rest ? "/" : NULL, + rest ? (endswith(path, "/") ? "" : "/") : NULL, rest && rest[0] == '/' ? rest+1 : rest, NULL); else return strjoin(path, - rest ? "/" : NULL, + rest ? (endswith(path, "/") ? "" : "/") : NULL, rest && rest[0] == '/' ? rest+1 : rest, NULL); } |