asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix arguments parsing in the main function

Browse source 
Fixes #2611 which was a regression from 692216b86a.
The bogus behaviour considered that if there were more than one arguments left to parse,
they would be a pair of arguments (switch and its parameter), and thus skipped the next
argument in all cases (thus potentially skipping a "-editor", which triggered #2611).

This is fixed by checking first for arguments that don't expect a parameter, and only
afterwards for arguments that expect a parameter. And if a "pair" of arguments is not
valid, we no longer increment the counter.
This commit is contained in:
Rémi Verschelde 2015-11-01 17:50:44 +01:00
parent 281d6fac1e
commit fc2c3bda5c
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
main/main.cpp
View file

@ -1007,8 +1007,21 @@ bool Main::start() {
bool export_debug=false; bool export_debug=false;
List<String> args = OS::get_singleton()->get_cmdline_args(); List<String> args = OS::get_singleton()->get_cmdline_args();
for (int i=0;i<args.size();i++) { for (int i=0;i<args.size();i++) {
//parameters that do not have an argument to the right
if (args[i]=="-nodocbase") {
doc_base=false;
} else if (args[i]=="-noquit") {
noquit=true;
} else if (args[i]=="-convert_old") {
convert_old=true;
} else if (args[i]=="-editor" || args[i]=="-e") {
editor=true;
} else if (args[i].length() && args[i][0] != '-' && game_path == "") {
game_path=args[i];
}
//parameters that have an argument to the right //parameters that have an argument to the right
if (i < (args.size()-1)) { else if (i < (args.size()-1)) {
bool parsed_pair=true;
if (args[i]=="-doctool") { if (args[i]=="-doctool") {
doc_tool=args[i+1]; doc_tool=args[i+1];
} else if (args[i]=="-script" || args[i]=="-s") { } else if (args[i]=="-script" || args[i]=="-s") {
@ -1037,20 +1050,13 @@ bool Main::start() {
} else if (args[i]=="-dumpstrings") { } else if (args[i]=="-dumpstrings") {
editor=true; //needs editor editor=true; //needs editor
dumpstrings=args[i+1]; dumpstrings=args[i+1];
} else {
// The parameter does not match anything known, don't skip the next argument
parsed_pair=false;
}
if (parsed_pair) {
i++;
} }
i++;
}
//parameters that do not have an argument to the right
if (args[i]=="-nodocbase") {
doc_base=false;
} else if (args[i]=="-noquit") {
noquit=true;
} else if (args[i]=="-convert_old") {
convert_old=true;
} else if (args[i]=="-editor" || args[i]=="-e") {
editor=true;
} else if (args[i].length() && args[i][0] != '-' && game_path == "") {
game_path=args[i];
} }
} }