0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make command line option errors consistently return 2 as documented

Browse source 
Also print the error before the dialog so you don't first have to dismiss it to see the message on stderr as well.
This commit is contained in:
Gunter Labes 2024-08-18 20:41:14 +02:00 • committed by Steve Cotton
parent cff5630f88
commit 0c278d38aa
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/wesnoth.cpp
View file

@ -527,9 +527,8 @@ static int process_command_args(commandline_options& cmdline_opts)
if(cmdline_opts.preprocess_defines || cmdline_opts.preprocess_input_macros || cmdline_opts.preprocess_path) {
// It would be good if this was supported for running tests too, possibly for other uses.
// For the moment show an error message instead of leaving the user wondering why it doesn't work.
PLAIN_LOG << "That --preprocess-* option is only supported when using --preprocess or --validate-wml.";
// Return an error status other than -1, because in our caller -1 means no error
return -2;
std::cerr << "That --preprocess-* option is only supported when using --preprocess or --validate-wml.";
return 2;
}
// Not the most intuitive solution, but I wanted to leave current semantics for now
@ -967,11 +966,11 @@ int main(int argc, char** argv)
safe_exit(res);
} catch(const boost::program_options::error& e) {
// logging hasn't been initialized by this point
std::cerr << "Error in command line: " << e.what() << std::endl;
std::string error = "Error parsing command line arguments: ";
error += e.what();
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", error.c_str(), nullptr);
std::cerr << "Error in command line: " << e.what();
error_exit(1);
error_exit(2);
} catch(const video::error& e) {
PLAIN_LOG << "Video system error: " << e.what();
error_exit(1);