LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

ReadConfigStream: assume the stream is good

Browse source
This commit is contained in:
Anthony Towns 2018-03-29 15:03:00 +10:00
parent 6d5815aad0
commit 087c5d2040
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/util.cpp
View file

@ -737,11 +737,8 @@ fs::path GetConfigFile(const std::string& confPath)
void ArgsManager::ReadConfigStream(std::istream& stream) void ArgsManager::ReadConfigStream(std::istream& stream)
{ {
if (!stream.good())
return; // No bitcoin.conf file is OK
{
LOCK(cs_args); LOCK(cs_args);
std::set<std::string> setOptions; std::set<std::string> setOptions;
setOptions.insert("*"); setOptions.insert("*");
@ -755,13 +752,16 @@ void ArgsManager::ReadConfigStream(std::istream& stream)
mapArgs[strKey] = strValue; mapArgs[strKey] = strValue;
mapMultiArgs[strKey].push_back(strValue); mapMultiArgs[strKey].push_back(strValue);
} }
}
} }
void ArgsManager::ReadConfigFile(const std::string& confPath) void ArgsManager::ReadConfigFile(const std::string& confPath)
{ {
fs::ifstream stream(GetConfigFile(confPath)); fs::ifstream stream(GetConfigFile(confPath));
// ok to not have a config file
if (stream.good()) {
ReadConfigStream(stream); ReadConfigStream(stream);
}
// If datadir is changed in .conf file: // If datadir is changed in .conf file:
ClearDatadirCache(); ClearDatadirCache();