VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Foerster <david.foerster@informatik.hu-berlin.de>2016-03-31 10:36:21 (GMT)
committerDavid Foerster <david.foerster@informatik.hu-berlin.de>2016-03-31 10:36:21 (GMT)
commit7d7c09e7184214f4e05621dfc467f6e117b1411f (patch)
treed63b529e28e4bb83dcb714e028b78d7cb4718238
parent39eae0e4c3d4e392feffd19b4e3b9449534d5426 (diff)
downloadVeraCrypt-7d7c09e7184214f4e05621dfc467f6e117b1411f.zip
VeraCrypt-7d7c09e7184214f4e05621dfc467f6e117b1411f.tar.gz
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.
-rw-r--r--src/Main/Application.cpp106
1 files changed, 88 insertions, 18 deletions
diff --git a/src/Main/Application.cpp b/src/Main/Application.cpp
index dec416a..cf71620 100644
--- a/src/Main/Application.cpp
+++ b/src/Main/Application.cpp
@@ -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;
-
- if (!Core->IsInPortableMode())
+ static const wxString *configDirC = NULL;
+ static bool configDirExists = false;
+
+ 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
- }
- else
- configDir = GetExecutableDirectory();
+ if (!configDirC)
+ {
+ wxString *configDir;
- if (createConfigDir && !configDir.IsDirectory())
- Directory::Create (configDir);
+ if (Core->IsInPortableMode())
+ {
+ configDir = new wxString (
+ wxPathOnly(wxStandardPaths::Get().GetExecutablePath()));
+ }
+ else
+ {
+ configDir = GetXdgConfigPath();
+ }
+
+ EnsureEndsWithPathSeparator(*configDir);
+ configDirC = configDir;
+ }
+
+ 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;
+ }
+ }
- FilePath filePath = wstring (wxFileName (wstring (configDir), configFileName).GetFullPath());
- return filePath;
+ return FilePath((*configDirC + configFileName).ToStdWstring());
}
DirectoryPath Application::GetExecutableDirectory ()