oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

config/Path: allow expanding $HOME even without XDG

Browse Source
This commit is contained in:
Max Kellermann
2025-03-11 08:44:44 +01:00
parent 147fe18ad6
commit 1dc8cd8eef
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/Path.cxx
View File

@@ -93,7 +93,6 @@ ParsePath(const char *path)
return GetHome(std::string{user}.c_str()) return GetHome(std::string{user}.c_str())
/ AllocatedPath::FromUTF8Throw(rest); / AllocatedPath::FromUTF8Throw(rest);
} }
#ifdef USE_XDG
} else if (path[0] == '$') { } else if (path[0] == '$') {
++path; ++path;
@@ -102,6 +101,7 @@ ParsePath(const char *path)
AllocatedPath xdg_path(nullptr); AllocatedPath xdg_path(nullptr);
if (env_var == "HOME"sv) { if (env_var == "HOME"sv) {
xdg_path = GetConfiguredHome(); xdg_path = GetConfiguredHome();
#ifdef USE_XDG
} else if (env_var == "XDG_CONFIG_HOME"sv) { } else if (env_var == "XDG_CONFIG_HOME"sv) {
xdg_path = GetUserConfigDir(); xdg_path = GetUserConfigDir();
} else if (env_var == "XDG_MUSIC_DIR"sv) { } else if (env_var == "XDG_MUSIC_DIR"sv) {
@@ -110,12 +110,12 @@ ParsePath(const char *path)
xdg_path = GetUserCacheDir(); xdg_path = GetUserCacheDir();
} else if (env_var == "XDG_RUNTIME_DIR"sv) { } else if (env_var == "XDG_RUNTIME_DIR"sv) {
xdg_path = GetUserRuntimeDir(); xdg_path = GetUserRuntimeDir();
#endif
} else { } else {
throw FmtRuntimeError("Unknown variable: {:?}", env_var); throw FmtRuntimeError("Unknown variable: {:?}", env_var);
} }
return xdg_path / AllocatedPath::FromUTF8Throw(rest); return xdg_path / AllocatedPath::FromUTF8Throw(rest);
#endif
} else if (!PathTraitsUTF8::IsAbsolute(path)) { } else if (!PathTraitsUTF8::IsAbsolute(path)) {
throw FmtRuntimeError("not an absolute path: {:?}", path); throw FmtRuntimeError("not an absolute path: {:?}", path);
} else { } else {