4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-01-28 18:56:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix argument checks

Browse Source
This commit is contained in:
Zachary Michaels 2014-06-16 19:25:52 -04:00
parent 3cb59539cd
commit efd262a621
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/command_line.h
View File

@ -160,6 +160,13 @@ namespace command_line
return !value.empty(); return !value.empty();
} }
template<typename T, bool required>
bool arg_present(const boost::program_options::variables_map& vm, const arg_descriptor<T, required>& arg)
{
auto value = vm[arg.name];
return !value.empty() && !value.defaulted();
}
template<typename T, bool required> template<typename T, bool required>
T get_arg(const boost::program_options::variables_map& vm, const arg_descriptor<T, required>& arg) T get_arg(const boost::program_options::variables_map& vm, const arg_descriptor<T, required>& arg)

10
src/daemon/daemon.cpp
View File

@ -40,7 +40,7 @@ namespace
const command_line::arg_descriptor<bool> arg_console = {"no-console", "Disable daemon console commands"}; const command_line::arg_descriptor<bool> arg_console = {"no-console", "Disable daemon console commands"};
const command_line::arg_descriptor<bool> arg_start_daemon = {"daemonize", "Run as daemon (*nix only)"}; const command_line::arg_descriptor<bool> arg_start_daemon = {"daemonize", "Run as daemon (*nix only)"};
const command_line::arg_descriptor<bool> arg_stop_daemon = {"stop-daemon", "Stop running daemon"}; const command_line::arg_descriptor<bool> arg_stop_daemon = {"stop", "Stop running daemon"};
const command_line::arg_descriptor<bool> arg_help_daemon = {"daemon-help", "Display daemon command help"}; const command_line::arg_descriptor<bool> arg_help_daemon = {"daemon-help", "Display daemon command help"};
const command_line::arg_descriptor<std::string> arg_daemon_command = {"send-command", "Send a command string to the running daemon"}; const command_line::arg_descriptor<std::string> arg_daemon_command = {"send-command", "Send a command string to the running daemon"};
} }
@ -178,19 +178,19 @@ int main(int argc, char* argv[])
log_space::log_singletone::add_logger(LOGGER_FILE, log_file_path.filename().string().c_str(), log_dir.c_str()); log_space::log_singletone::add_logger(LOGGER_FILE, log_file_path.filename().string().c_str(), log_dir.c_str());
} }
if (command_line::has_arg(vm, arg_start_daemon)) { if (command_line::arg_present(vm, arg_start_daemon)) {
std::cout << "start daemon" << std::endl; std::cout << "start daemon" << std::endl;
return 0; return 0;
} }
if (command_line::has_arg(vm, arg_stop_daemon)) { if (command_line::arg_present(vm, arg_stop_daemon)) {
std::cout << "stop daemon" << std::endl; std::cout << "stop daemon" << std::endl;
return 0; return 0;
} }
if (command_line::has_arg(vm, arg_help_daemon)) { if (command_line::arg_present(vm, arg_help_daemon)) {
std::cout << "daemon help" << std::endl; std::cout << "daemon help" << std::endl;
return 0; return 0;
} }
if (command_line::has_arg(vm, arg_daemon_command)) { if (command_line::arg_present(vm, arg_daemon_command)) {
std::string command = command_line::get_arg(vm, arg_daemon_command); std::string command = command_line::get_arg(vm, arg_daemon_command);
std::cout << "daemon command: " << command << std::endl; std::cout << "daemon command: " << command << std::endl;
return 0; return 0;