shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 09:56:51 +03:00
Code

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

Browse Source 
No need to insert duplicate "/" if we can avoid it. This is particularly
relevant if the prefix passed in is the root directory.
This commit is contained in:
Lennart Poettering 2018-01-17 11:15:00 +01:00
parent 81cce8ded5
commit cddd2ce106
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/basic/path-util.c
View File

@ -84,7 +84,10 @@ char *path_make_absolute(const char *p, const char *prefix) {
if (path_is_absolute(p) || isempty(prefix)) if (path_is_absolute(p) || isempty(prefix))
return strdup(p); 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) { int path_make_absolute_cwd(const char *p, char **ret) {