diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-01-17 11:15:00 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-01-17 11:15:00 +0100 |
| commit | cddd2ce1069c4d84179ce606e830db98abc50609 (patch) | |
| tree | cf6e44054671411d553fe81a96e04784a41a42c5 /src/basic | |
| parent | 81cce8ded58ed2f2e6ef2227509a90ad60d63502 (diff) | |
| download | systemd-cddd2ce1069c4d84179ce606e830db98abc50609.tar.gz | |
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.
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/path-util.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/basic/path-util.c b/src/basic/path-util.c index b877bdc1cb..f5f506ccf5 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) { |