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".

fs/StandardDirectory: look for cache dir in environment, not user-dirs
cd289843 · Mantas Mikulėnas · Max Kellermann · b1233925 · cd289843
Commit cd289843 authored Jul 10, 2014 by Mantas Mikulėnas Committed by Max Kellermann Jul 11, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 3 deletions

StandardDirectory.cxx src/fs/StandardDirectory.cxx +15 -3

No files found.
--- a/src/fs/StandardDirectory.cxx
+++ b/src/fs/StandardDirectory.cxx
@@ -254,11 +254,23 @@ AllocatedPath GetUserMusicDir()
 #endif
 }

-AllocatedPath
-GetUserCacheDir()
+AllocatedPath GetUserCacheDir()
 {
 #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)
 	return context->GetCacheDir(Java::GetEnv());
 #else