Separate out ReadConfigStream from ReadConfigFile

ajtowns · ajtowns · commit 6d5815aad0ee · 2018-04-06T04:46:32.000+10:00
diff --git a/src/util.cpp b/src/util.cpp
@@ -735,18 +735,17 @@ fs::path GetConfigFile(const std::string& confPath)
     return AbsPathForConfigVal(fs::path(confPath), false);
 }
 
-void ArgsManager::ReadConfigFile(const std::string& confPath)
+void ArgsManager::ReadConfigStream(std::istream& stream)
 {
-    fs::ifstream streamConfig(GetConfigFile(confPath));
-    if (!streamConfig.good())
+    if (!stream.good())
         return; // No bitcoin.conf file is OK
 
     {
         LOCK(cs_args);
         std::set<std::string> setOptions;
         setOptions.insert("*");
 
-        for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it)
+        for (boost::program_options::detail::config_file_iterator it(stream, setOptions), end; it != end; ++it)
         {
             // Don't overwrite existing settings so command line settings override bitcoin.conf
             std::string strKey = std::string("-") + it->string_key;
@@ -757,6 +756,13 @@ void ArgsManager::ReadConfigFile(const std::string& confPath)
             mapMultiArgs[strKey].push_back(strValue);
         }
     }
+}
+
+void ArgsManager::ReadConfigFile(const std::string& confPath)
+{
+    fs::ifstream stream(GetConfigFile(confPath));
+    ReadConfigStream(stream);
+
     // If datadir is changed in .conf file:
     ClearDatadirCache();
     if (!fs::is_directory(GetDataDir(false))) {
diff --git a/src/util.h b/src/util.h
@@ -228,6 +228,8 @@ class ArgsManager
     std::map<std::string, std::vector<std::string>> mapMultiArgs;
     std::unordered_set<std::string> m_negated_args;
 
+    void ReadConfigStream(std::istream& stream);
+
 public:
     void ParseParameters(int argc, const char*const argv[]);
     void ReadConfigFile(const std::string& confPath);

Original file line number	Diff line number	Diff line change
`@@ -735,18 +735,17 @@ fs::path GetConfigFile(const std::string& confPath)`
`735`	`735`	`return AbsPathForConfigVal(fs::path(confPath), false);`
`736`	`736`	`}`
`737`	`737`
`738`		`-void ArgsManager::ReadConfigFile(const std::string& confPath)`
	`738`	`+void ArgsManager::ReadConfigStream(std::istream& stream)`
`739`	`739`	`{`
`740`		`- fs::ifstream streamConfig(GetConfigFile(confPath));`
`741`		`- if (!streamConfig.good())`
	`740`	`+ if (!stream.good())`
`742`	`741`	`return; // No bitcoin.conf file is OK`
`743`	`742`
`744`	`743`	`{`
`745`	`744`	`LOCK(cs_args);`
`746`	`745`	`std::set<std::string> setOptions;`
`747`	`746`	`setOptions.insert("*");`
`748`	`747`
`749`		`- for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it)`
	`748`	`+ for (boost::program_options::detail::config_file_iterator it(stream, setOptions), end; it != end; ++it)`
`750`	`749`	`{`
`751`	`750`	`// Don't overwrite existing settings so command line settings override bitcoin.conf`
`752`	`751`	`std::string strKey = std::string("-") + it->string_key;`
`@@ -757,6 +756,13 @@ void ArgsManager::ReadConfigFile(const std::string& confPath)`
`757`	`756`	`mapMultiArgs[strKey].push_back(strValue);`
`758`	`757`	`}`
`759`	`758`	`}`
	`759`	`+}`
	`760`	`+`
	`761`	`+void ArgsManager::ReadConfigFile(const std::string& confPath)`
	`762`	`+{`
	`763`	`+ fs::ifstream stream(GetConfigFile(confPath));`
	`764`	`+ ReadConfigStream(stream);`
	`765`	`+`
`760`	`766`	`// If datadir is changed in .conf file:`
`761`	`767`	`ClearDatadirCache();`
`762`	`768`	`if (!fs::is_directory(GetDataDir(false))) {`