diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-02 07:19:29 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-02 07:19:29 +0200 |
| commit | 0b914c8f5d690dfc1bdfbca1e1083372c5ed84d8 (patch) | |
| tree | b106600a18dcd0b4586aee4da9533b6c15264b40 /src/Main/Application.cpp | |
| parent | 650d913f51304c348158cbe7bb8b47cd6d4a4a58 (diff) | |
| parent | faea63cb3c135316c035152dbdb1d5b98ae43907 (diff) | |
| download | VeraCrypt-0b914c8f5d690dfc1bdfbca1e1083372c5ed84d8.tar.gz VeraCrypt-0b914c8f5d690dfc1bdfbca1e1083372c5ed84d8.zip | |
Merge pull request #55 from davidfoerster/xdg-config-paths
Use XDG_CONFIG_HOME to determine the path of the configuration
Diffstat (limited to 'src/Main/Application.cpp')
| -rw-r--r-- | src/Main/Application.cpp | 107 |
1 files changed, 86 insertions, 21 deletions
diff --git a/src/Main/Application.cpp b/src/Main/Application.cpp index a4b3c60c..4b013cfc 100644 --- a/src/Main/Application.cpp +++ b/src/Main/Application.cpp @@ -3,7 +3,7 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are governed by the Apache License 2.0 the full text of which is contained in the file License.txt included in VeraCrypt binary and source @@ -22,12 +22,60 @@ namespace VeraCrypt { + namespace + { + void EnsureEndsWithPathSeparator( wxString &s ) + { + const wxUniChar pathSeparator = wxFileName::GetPathSeparator(); + if (s[s.size() - 1] != pathSeparator) + s.append(pathSeparator); + } + + wxString *GetXdgConfigPath () + { + const wxChar *xdgConfig = wxGetenv(wxT("XDG_CONFIG_HOME")); + wxString *configDir; + + if (!wxIsEmpty(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; mUserInterfaceType = UserInterfaceType::Text; return mUserInterface; - } + } #ifndef TC_NO_GUI wxApp* Application::CreateGuiApp () @@ -35,32 +83,49 @@ namespace VeraCrypt mUserInterface = new GraphicUserInterface; mUserInterfaceType = UserInterfaceType::Graphic; return mUserInterface; - } + } #endif FilePath Application::GetConfigFilePath (const wxString &configFileName, bool createConfigDir) { - DirectoryPath configDir; - - if (!Core->IsInPortableMode()) + static wxScopedPtr<const wxString> configDirC; + 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.reset(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 () |