libtransport.git Changeset - e1d14b695134

Changeset - e1d14b695134

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Jan Kaluza - 13 years ago 2012-04-19 09:48:39
hanzz.k@gmail.com

Fixed unregistered-options parsing

2 files changed with 8 insertions and 6 deletions:

spectrum/src/main.cpp

src/config.cpp

0 comments (0 inline, 0 general)

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -144,13 +144,13 @@ int main(int argc, char **argv) @@
+		;
 	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).run(), vm);
+          options(desc).positional(p).allow_unregistered().run(), vm);
 		boost::program_options::notify(vm);
 		if (vm.count("version")) {
 			std::cout << SPECTRUM_VERSION << "\n";
 			return 0;
+		}

src/config.cpp

➞

Show inline comments

 		("logging.backend_config", value<std::string>()->default_value(""), "Path to log4cxx config file which is used for backends")
 		("backend.default_avatar", value<std::string>()->default_value(""), "Full path to default avatar")
 		("backend.avatars_directory", value<std::string>()->default_value(""), "Path to directory with avatars")
 		("backend.no_vcard_fetch", value<bool>()->default_value(false), "True if VCards for buddies should not be fetched. Only avatars will be forwarded.")
+	;
 	// Load configs passed by command line
 	if (m_argc != 0 && m_argv) {
 		basic_command_line_parser<char> parser = command_line_parser(m_argc, m_argv).options(opts).allow_unregistered();
 		parsed_options parsed = parser.run();
 		store(parsed, m_variables);
+	}
 	parsed_options parsed = parse_config_file(ifs, opts, true);
 	bool found_working = false;
 	bool found_pidfile = false;
 	bool found_backend_port = false;
 	bool found_database = false;
+		}
 		else if (opt.value[0].find("$jid") != std::string::npos) {
 			boost::replace_all(opt.value[0], "$jid", jid);
+		}
+	}
 	// Load configs passed by command line
 	if (m_argc != 0 && m_argv) {
 		store(parse_command_line(m_argc, m_argv, opts), m_variables);
+	}
 	store(parsed, m_variables);
 	notify(m_variables);
 	onConfigReloaded();
 	return true;

0 comments (0 inline, 0 general)