diff --git a/src/util/system.h b/src/util/system.h --- a/src/util/system.h +++ b/src/util/system.h @@ -321,9 +321,10 @@ std::string GetHelpMessage() const; /** - * Check whether we know of this arg + * Return Flags for known arg. + * Return ArgsManager::NONE for unknown arg. */ - bool IsArgKnown(const std::string &key) const; + unsigned int FlagsOfKnownArg(const std::string &key) const; }; extern ArgsManager gArgs; diff --git a/src/util/system.cpp b/src/util/system.cpp --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -435,20 +435,22 @@ for (int i = 1; i < argc; i++) { std::string key(argv[i]); + if (key == "-") { + // bitcoin-tx using stdin + break; + } std::string val; if (!ParseKeyValue(key, val)) { break; } - // Check that the arg is known - if (!(IsSwitchChar(key[0]) && key.size() == 1)) { - if (!IsArgKnown(key)) { - error = strprintf("Invalid parameter %s", key.c_str()); - return false; - } + const unsigned int flags = FlagsOfKnownArg(key); + if (flags) { + InterpretOption(key, val, m_override_args); + } else { + error = strprintf("Invalid parameter %s", key.c_str()); + return false; } - - InterpretOption(key, val, m_override_args); } // we do not allow -includeconf from command line, so we clear it here @@ -466,7 +468,7 @@ return true; } -bool ArgsManager::IsArgKnown(const std::string &key) const { +unsigned int ArgsManager::FlagsOfKnownArg(const std::string &key) const { assert(key[0] == '-'); size_t option_index = key.find('.'); @@ -483,11 +485,12 @@ LOCK(cs_args); for (const auto &arg_map : m_available_args) { - if (arg_map.second.count(base_arg_name)) { - return true; + const auto search = arg_map.second.find(base_arg_name); + if (search != arg_map.second.end()) { + return search->second.m_flags; } } - return false; + return ArgsManager::NONE; } std::vector ArgsManager::GetArgs(const std::string &strArg) const { @@ -958,20 +961,19 @@ } for (const std::pair &option : options) { const std::string strKey = std::string("-") + option.first; - // Check that the arg is known - if (!IsArgKnown(strKey)) { - if (!ignore_invalid_keys) { + const unsigned int flags = FlagsOfKnownArg(strKey); + if (flags) { + InterpretOption(strKey, option.second, m_config_args); + } else { + if (ignore_invalid_keys) { + LogPrintf("Ignoring unknown configuration value %s\n", + option.first); + } else { error = strprintf("Invalid configuration value %s", option.first.c_str()); return false; - } else { - LogPrintf("Ignoring unknown configuration value %s\n", - option.first); - continue; } } - - InterpretOption(strKey, option.second, m_config_args); } return true; }