SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16793 from poettering/path-join-more

Browse Source 
path-lookup: path_join() all the things!
This commit is contained in:
Anita Zhang
2020-08-19 23:12:50 -07:00
committed by GitHub
parent c2892a244c df778749b4
commit e3897c1aff
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/path-lookup.c
+5 -5
View File
@@ -27,7 +27,7 @@ int xdg_user_runtime_dir(char **ret, const char *suffix) {
if (!e)
return -ENXIO;
j = strjoin(e, suffix);
j = path_join(e, suffix);
if (!j)
return -ENOMEM;
@@ -44,7 +44,7 @@ int xdg_user_config_dir(char **ret, const char *suffix) {
e = getenv("XDG_CONFIG_HOME");
if (e)
j = strjoin(e, suffix);
j = path_join(e, suffix);
else {
_cleanup_free_ char *home = NULL;
@@ -52,7 +52,7 @@ int xdg_user_config_dir(char **ret, const char *suffix) {
if (r < 0)
return r;
j = strjoin(home, "/.config", suffix);
j = path_join(home, "/.config", suffix);
}
if (!j)
@@ -76,7 +76,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) {
e = getenv("XDG_DATA_HOME");
if (e)
j = strjoin(e, suffix);
j = path_join(e, suffix);
else {
_cleanup_free_ char *home = NULL;
@@ -84,7 +84,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) {
if (r < 0)
return r;
j = strjoin(home, "/.local/share", suffix);
j = path_join(home, "/.local/share", suffix);
}
if (!j)
return -ENOMEM;