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

fs/StandardDirectory: add GetUserRuntimeDir()

Browse Source
This commit is contained in:
Max Kellermann 2021-10-26 09:04:42 +02:00
parent 225d85fd9b
commit 1e6f5f012c
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Listen.cxx
View File

@ -32,6 +32,7 @@
#include "net/SocketUtil.hxx" #include "net/SocketUtil.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include "fs/StandardDirectory.hxx"
#include "fs/XDG.hxx" #include "fs/XDG.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
@ -85,7 +86,7 @@ ListenXdgRuntimeDir(ClientListener &listener) noexcept
use $XDG_RUNTIME_DIR */ use $XDG_RUNTIME_DIR */
return false; return false;
Path xdg_runtime_dir = Path::FromFS(getenv("XDG_RUNTIME_DIR")); const auto xdg_runtime_dir = GetUserRuntimeDir();
if (xdg_runtime_dir.IsNull()) if (xdg_runtime_dir.IsNull())
return false; return false;

10
src/fs/StandardDirectory.cxx
View File

@ -282,6 +282,16 @@ GetUserCacheDir() noexcept
#endif #endif
} }
AllocatedPath
GetUserRuntimeDir() noexcept
{
#ifdef USE_XDG
return SafePathFromFS(getenv("XDG_RUNTIME_DIR"));
#else
return nullptr;
#endif
}
#ifdef _WIN32 #ifdef _WIN32
AllocatedPath AllocatedPath

7
src/fs/StandardDirectory.hxx
View File

@ -43,6 +43,13 @@ GetUserMusicDir() noexcept;
AllocatedPath AllocatedPath
GetUserCacheDir() noexcept; GetUserCacheDir() noexcept;
/**
* Obtains the runtime directory for the current user.
*/
[[gnu::const]]
AllocatedPath
GetUserRuntimeDir() noexcept;
#ifdef _WIN32 #ifdef _WIN32
/** /**