Skip to content

M
mpd
Commit cd289843 authored by Mantas Mikulėnas's avatar Mantas Mikulėnas Committed by Max Kellermann
Browse files
Options

fs/StandardDirectory: look for cache dir in environment, not user-dirs

The XDG cache directory is part of the "base directories" spec like $XDG_CONFIG_HOME, not "user directories".
parent b1233925
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 3 deletions
src/fs/StandardDirectory.cxx
View file @ cd289843
...@@ -254,11 +254,23 @@ AllocatedPath GetUserMusicDir() ...@@ -254,11 +254,23 @@ AllocatedPath GetUserMusicDir()
#endif #endif
} }
AllocatedPath AllocatedPath GetUserCacheDir()
GetUserCacheDir()
{ {
#ifdef USE_XDG #ifdef USE_XDG
return GetUserDir("XDG_CACHE_DIR"); // Check for $XDG_CACHE_HOME
auto cache_home = getenv("XDG_CACHE_HOME");
if (IsValidPathString(cache_home) && IsValidDir(cache_home))
return AllocatedPath::FromFS(cache_home);
// Check for $HOME/.cache
auto home = GetHomeDir();
if (!home.IsNull()) {
AllocatedPath fallback = AllocatedPath::Build(home, ".cache");
if (IsValidDir(fallback.c_str()))
return fallback;
}
return AllocatedPath::Null();
#elif defined(ANDROID) #elif defined(ANDROID)
return context->GetCacheDir(Java::GetEnv()); return context->GetCacheDir(Java::GetEnv());
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment