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

fs/StandardDirectory: move code to GetExistingEnvDirectory()

Browse Source
This commit is contained in:
Max Kellermann 2022-11-28 18:41:30 +01:00
parent 9669ea6a12
commit a38eabc8bc
1 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/fs/StandardDirectory.cxx
View File

@ -144,6 +144,38 @@ GetStandardDir(int folder_id) noexcept
#ifdef USE_XDG #ifdef USE_XDG
[[gnu::pure]]
static Path
GetEnvPath(const char *name) noexcept
{
if (const char *value = getenv(name); IsValidPathString(value))
return Path::FromFS(value);
return nullptr;
}
[[gnu::pure]]
static Path
GetAbsoluteEnvPath(const char *name) noexcept
{
if (const auto path = GetEnvPath(name);
path != nullptr && path.IsAbsolute())
return path;
return nullptr;
}
[[gnu::pure]]
static Path
GetExistingEnvDirectory(const char *name) noexcept
{
if (const auto path = GetAbsoluteEnvPath(name);
path != nullptr && DirectoryExists(path))
return path;
return nullptr;
}
static bool static bool
ParseConfigLine(std::string_view line, std::string_view dir_name, ParseConfigLine(std::string_view line, std::string_view dir_name,
AllocatedPath &result_dir) noexcept AllocatedPath &result_dir) noexcept
@ -235,9 +267,9 @@ GetUserConfigDir() noexcept
return GetStandardDir(CSIDL_LOCAL_APPDATA); return GetStandardDir(CSIDL_LOCAL_APPDATA);
#elif defined(USE_XDG) #elif defined(USE_XDG)
// Check for $XDG_CONFIG_HOME // Check for $XDG_CONFIG_HOME
if (const auto config_home = getenv("XDG_CONFIG_HOME"); if (const auto path = GetExistingEnvDirectory("XDG_CONFIG_HOME");
IsValidPathString(config_home) && IsValidDir(config_home)) path != nullptr)
return AllocatedPath::FromFS(config_home); return AllocatedPath{path};
// Check for $HOME/.config // Check for $HOME/.config
if (const auto home = GetHomeDir(); !home.IsNull()) { if (const auto home = GetHomeDir(); !home.IsNull()) {
@ -272,9 +304,9 @@ GetUserCacheDir() noexcept
{ {
#ifdef USE_XDG #ifdef USE_XDG
// Check for $XDG_CACHE_HOME // Check for $XDG_CACHE_HOME
if (const auto cache_home = getenv("XDG_CACHE_HOME"); if (const auto path = GetExistingEnvDirectory("XDG_CACHE_HOME");
IsValidPathString(cache_home) && IsValidDir(cache_home)) path != nullptr)
return AllocatedPath::FromFS(cache_home); return AllocatedPath{path};
// Check for $HOME/.cache // Check for $HOME/.cache
if (const auto home = GetHomeDir(); !home.IsNull()) if (const auto home = GetHomeDir(); !home.IsNull())
@ -312,10 +344,12 @@ AllocatedPath
GetUserRuntimeDir() noexcept GetUserRuntimeDir() noexcept
{ {
#ifdef USE_XDG #ifdef USE_XDG
return SafePathFromFS(getenv("XDG_RUNTIME_DIR")); if (const auto path = GetExistingEnvDirectory("XDG_RUNTIME_DIR");
#else path != nullptr)
return nullptr; return AllocatedPath{path};
#endif #endif
return nullptr;
} }
AllocatedPath AllocatedPath