komodo strings
This commit is contained in:
16
src/util.cpp
16
src/util.cpp
@@ -381,7 +381,7 @@ static std::string FormatException(const std::exception* pex, const char* pszThr
|
||||
char pszModule[MAX_PATH] = "";
|
||||
GetModuleFileNameA(NULL, pszModule, sizeof(pszModule));
|
||||
#else
|
||||
const char* pszModule = "Zcash";
|
||||
const char* pszModule = "Komodo";
|
||||
#endif
|
||||
if (pex)
|
||||
return strprintf(
|
||||
@@ -408,7 +408,7 @@ boost::filesystem::path GetDefaultDataDir()
|
||||
// Unix: ~/.zcash
|
||||
#ifdef WIN32
|
||||
// Windows
|
||||
return GetSpecialFolderPath(CSIDL_APPDATA) / "Zcash";
|
||||
return GetSpecialFolderPath(CSIDL_APPDATA) / "Komodo";
|
||||
#else
|
||||
fs::path pathRet;
|
||||
char* pszHome = getenv("HOME");
|
||||
@@ -420,10 +420,10 @@ boost::filesystem::path GetDefaultDataDir()
|
||||
// Mac
|
||||
pathRet /= "Library/Application Support";
|
||||
TryCreateDirectory(pathRet);
|
||||
return pathRet / "Zcash";
|
||||
return pathRet / "Komodo";
|
||||
#else
|
||||
// Unix
|
||||
return pathRet / ".zcash";
|
||||
return pathRet / ".komodo";
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
@@ -521,7 +521,7 @@ void ClearDatadirCache()
|
||||
|
||||
boost::filesystem::path GetConfigFile()
|
||||
{
|
||||
boost::filesystem::path pathConfigFile(GetArg("-conf", "zcash.conf"));
|
||||
boost::filesystem::path pathConfigFile(GetArg("-conf", "komodo.conf"));
|
||||
if (!pathConfigFile.is_complete())
|
||||
pathConfigFile = GetDataDir(false) / pathConfigFile;
|
||||
|
||||
@@ -533,14 +533,14 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
|
||||
{
|
||||
boost::filesystem::ifstream streamConfig(GetConfigFile());
|
||||
if (!streamConfig.good())
|
||||
return; // No zcash.conf file is OK
|
||||
return; // No komodo.conf file is OK
|
||||
|
||||
set<string> setOptions;
|
||||
setOptions.insert("*");
|
||||
|
||||
for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it)
|
||||
{
|
||||
// Don't overwrite existing settings so command line settings override zcash.conf
|
||||
// Don't overwrite existing settings so command line settings override komodo.conf
|
||||
string strKey = string("-") + it->string_key;
|
||||
if (mapSettingsRet.count(strKey) == 0)
|
||||
{
|
||||
@@ -557,7 +557,7 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
|
||||
#ifndef WIN32
|
||||
boost::filesystem::path GetPidFile()
|
||||
{
|
||||
boost::filesystem::path pathPidFile(GetArg("-pid", "zcashd.pid"));
|
||||
boost::filesystem::path pathPidFile(GetArg("-pid", "komodod.pid"));
|
||||
if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile;
|
||||
return pathPidFile;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user