X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-lookup.c;h=e072fd60928dfa1e2a493e87e15eaf7e0db6cbd0;hb=8d2a6145334257c8a9ceabc9dd52dff06cca818e;hp=c6b4ba1e22bff59117b7ad90723ab4108ef76226;hpb=12ed81d9c88406234c20e9261ae8c8b992d8bc4d;p=elogind.git diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index c6b4ba1e2..e072fd609 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -125,6 +125,8 @@ static char** user_dirs( goto fail; } else if (home) { + _cleanup_free_ char *data_home_parent = NULL; + if (asprintf(&data_home, "%s/.local/share/systemd/user", home) < 0) goto fail; @@ -135,8 +137,14 @@ static char** user_dirs( * then filter out this link, if it is actually is * one. */ - mkdir_parents_label(data_home, 0777); - (void) symlink("../../../.config/systemd/user", data_home); + if (path_get_parent(data_home, &data_home_parent) >= 0) { + _cleanup_free_ char *config_home_relative = NULL; + + if (path_make_relative(data_home_parent, config_home, &config_home_relative) >= 0) { + mkdir_parents_label(data_home, 0777); + (void) symlink(config_home_relative, data_home); + } + } } e = getenv("XDG_DATA_DIRS");