mirror of
https://github.com/veracrypt/VeraCrypt
synced 2024-11-10 21:23:40 +01:00
Use XDG_CONFIG_HOME to determine the path of the configuration
Adhere to XDG Desktop Specification and use the environment variable XDG_CONFIG_HOME to determine location of configuration files on *all* platforms. If it is unset or empty resort to platform-specific defaults. On Windows and OS X, `wxStandardPaths` provides correct defaults (equal to the previous hard-coded paths) but on Linux and other Unices `~/.config/appinfo` would be better than `~/.appinfo`. This means we treat those platforms as a special case. It also means that we may need to fall back to the legacy location if it exists but the new location doesn't.
This commit is contained in:
parent
39eae0e4c3
commit
7d7c09e718
@ -22,6 +22,59 @@
|
||||
|
||||
namespace VeraCrypt
|
||||
{
|
||||
namespace
|
||||
{
|
||||
void EnsureEndsWithPathSeparator( wxString &s )
|
||||
{
|
||||
const wxUniChar pathSeparator = wxFileName::GetPathSeparator();
|
||||
if (s[s.size() - 1] != pathSeparator)
|
||||
s.append(pathSeparator);
|
||||
}
|
||||
|
||||
wxString *GetXdgConfigPath ()
|
||||
{
|
||||
wxString *configDir;
|
||||
|
||||
#ifdef TC_WINDOWS
|
||||
const wchar_t *xdgConfig = ::_wgetenv(L"XDG_CONFIG_HOME");
|
||||
#else
|
||||
const char *xdgConfig = ::getenv("XDG_CONFIG_HOME");
|
||||
#endif
|
||||
|
||||
if (xdgConfig && *xdgConfig)
|
||||
{
|
||||
configDir = new wxString (xdgConfig);
|
||||
//wcerr << L"XDG_CONFIG_HOME=" << *configDir << endl;
|
||||
EnsureEndsWithPathSeparator(*configDir);
|
||||
configDir->append(Application::GetName());
|
||||
}
|
||||
else
|
||||
{
|
||||
#if !defined(TC_UNIX) || defined(TC_MACOSX) // Windows, OS X:
|
||||
configDir =
|
||||
new wxString (wxStandardPaths::Get().GetUserDataDir());
|
||||
#else // Linux, FreeBSD, Solaris:
|
||||
configDir = new wxString (wxFileName::GetHomeDir());
|
||||
configDir->append(wxT("/.config/"));
|
||||
configDir->append(Application::GetName());
|
||||
|
||||
if (!wxDirExists(*configDir))
|
||||
{
|
||||
wxString legacyConfigDir = wxStandardPaths::Get().GetUserDataDir();
|
||||
//wcerr << L"Legacy config dir: " << legacyConfigDir << endl;
|
||||
if (wxDirExists(legacyConfigDir))
|
||||
{
|
||||
configDir->swap(legacyConfigDir);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
//wcerr << L"Config dir: " << *configDir << endl;
|
||||
return configDir;
|
||||
}
|
||||
}
|
||||
|
||||
wxApp* Application::CreateConsoleApp ()
|
||||
{
|
||||
mUserInterface = new TextUserInterface;
|
||||
@ -40,27 +93,44 @@ namespace VeraCrypt
|
||||
|
||||
FilePath Application::GetConfigFilePath (const wxString &configFileName, bool createConfigDir)
|
||||
{
|
||||
DirectoryPath configDir;
|
||||
static const wxString *configDirC = NULL;
|
||||
static bool configDirExists = false;
|
||||
|
||||
if (!Core->IsInPortableMode())
|
||||
if (!configDirExists)
|
||||
{
|
||||
#ifdef TC_MACOSX
|
||||
wxFileName configPath (L"~/Library/Application Support/VeraCrypt");
|
||||
configPath.Normalize();
|
||||
configDir = wstring (configPath.GetFullPath());
|
||||
#else
|
||||
wxStandardPaths& stdPaths = wxStandardPaths::Get();
|
||||
configDir = wstring (stdPaths.GetUserDataDir());
|
||||
#endif
|
||||
if (!configDirC)
|
||||
{
|
||||
wxString *configDir;
|
||||
|
||||
if (Core->IsInPortableMode())
|
||||
{
|
||||
configDir = new wxString (
|
||||
wxPathOnly(wxStandardPaths::Get().GetExecutablePath()));
|
||||
}
|
||||
else
|
||||
configDir = GetExecutableDirectory();
|
||||
{
|
||||
configDir = GetXdgConfigPath();
|
||||
}
|
||||
|
||||
if (createConfigDir && !configDir.IsDirectory())
|
||||
Directory::Create (configDir);
|
||||
EnsureEndsWithPathSeparator(*configDir);
|
||||
configDirC = configDir;
|
||||
}
|
||||
|
||||
FilePath filePath = wstring (wxFileName (wstring (configDir), configFileName).GetFullPath());
|
||||
return filePath;
|
||||
if (createConfigDir)
|
||||
{
|
||||
if (!wxDirExists(*configDirC))
|
||||
{
|
||||
//wcerr << L"Creating config dir »" << *configDirC << L"« ..." << endl;
|
||||
throw_sys_sub_if(
|
||||
!wxMkdir(*configDirC, wxS_IRUSR | wxS_IWUSR | wxS_IXUSR),
|
||||
configDirC->ToStdWstring());
|
||||
}
|
||||
configDirExists = true;
|
||||
//wcerr << L"Config directory »" << *configDirC << L"« exists now" << endl;
|
||||
}
|
||||
}
|
||||
|
||||
return FilePath((*configDirC + configFileName).ToStdWstring());
|
||||
}
|
||||
|
||||
DirectoryPath Application::GetExecutableDirectory ()
|
||||
|
Loading…
Reference in New Issue
Block a user