diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp index db76217f517330a216f187523035473de0cfd581..fc4bc886497e9520148bd8cbe76701db47821d2f 100644 --- a/backends/libpurple/main.cpp +++ b/backends/libpurple/main.cpp @@ -1641,51 +1641,14 @@ int main(int argc, char **argv) { } #endif - std::string configFile; - boost::program_options::variables_map vm; - boost::program_options::options_description desc("Usage: spectrum \nAllowed options"); - desc.add_options() - ("help", "help") - ("host,h", boost::program_options::value(&host)->default_value(""), "Host to connect to") - ("port,p", boost::program_options::value(&port)->default_value(10000), "Port to connect to") - ("config", boost::program_options::value(&configFile)->default_value(""), "Config file") - ; - - try - { - boost::program_options::positional_options_description p; - p.add("config", -1); - boost::program_options::store(boost::program_options::command_line_parser(argc, argv). - options(desc).positional(p).allow_unregistered().run(), vm); - boost::program_options::notify(vm); - - if(vm.count("help")) - { - std::cout << desc << "\n"; - return 1; - } - - if(vm.count("config") == 0) { - std::cout << desc << "\n"; - return 1; - } - } - catch (std::runtime_error& e) - { - std::cout << desc << "\n"; - return 1; - } - catch (...) - { - std::cout << desc << "\n"; + std::string error; + Config *cfg = Config::createFromArgs(argc, argv, error, host, port); + if (cfg == NULL) { + std::cerr << error; return 1; } - config = boost::make_shared(argc, argv); - if (!config->load(vm["config"].as())) { - std::cerr << "Can't load configuration file.\n"; - return 1; - } + config = boost::shared_ptr(cfg); Logging::initBackendLogging(config.get()); initPurple();