fly/flightgear
1
0
Fork 0
Code Activity

Renamed fgParseOptions(int,string) to fgParseArgs, and modified the

Browse source 
function to allow property files as non-option parameters after the
options have finished (and added "--" to terminate options).  It's now
possible to do something like

  fgfs denver-am.fgd

or even

  fgfs at-lax.fgd in-c310.fgd around-sunset.fgd

This works the same way as the --config option, but will be friendlier
for GUIs, where start-up situation files can now be associated easily
with FlightGear.
This commit is contained in:
david 2002-01-04 20:58:48 +00:00
parent 3ddf66206a
commit 3cbc6f21c7
3 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Main/fg_init.cxx
View file

@ -288,7 +288,7 @@ bool fgInitConfig ( int argc, char **argv ) {
// Parse remaining command line options
// These will override anything specified in a config file
fgParseOptions(argc, argv);
fgParseArgs(argc, argv);
return true;
}

34
src/Main/options.cxx
View file

@ -1001,23 +1001,35 @@ fgScanForRoot (const string& path)
// Parse the command line options
void
fgParseOptions (int argc, char **argv) {
int i = 1;
int result;
fgParseArgs (int argc, char **argv)
{
bool in_options = true;
SG_LOG(SG_GENERAL, SG_INFO, "Processing command line arguments");
while ( i < argc ) {
SG_LOG( SG_GENERAL, SG_DEBUG, "argv[" << i << "] = " << argv[i] );
for (int i = 1; i < argc; i++) {
string arg = argv[i];
result = parse_option(argv[i]);
if ( (result == FG_OPTIONS_HELP) || (result == FG_OPTIONS_ERROR) ) {
fgUsage();
exit(-1);
if (in_options && (arg.find('-') == 0)) {
if (arg == "--") {
in_options = false;
} else {
int result = parse_option(arg);
if ( (result == FG_OPTIONS_HELP) ||
(result == FG_OPTIONS_ERROR) ) {
fgUsage();
exit(-1);
}
}
} else {
in_options = false;
SG_LOG(SG_GENERAL, SG_INFO,
"Reading command-line property file " << arg);
readProperties(arg, globals->get_props());
}
i++;
}
SG_LOG(SG_GENERAL, SG_INFO, "Finished command line arguments");
}

2
src/Main/options.hxx
View file

@ -32,7 +32,7 @@
extern void fgSetDefaults ();
extern string fgScanForRoot (int argc, char ** argv);
extern string fgScanForRoot (const string &file_path);
extern void fgParseOptions (int argc, char ** argv);
extern void fgParseArgs (int argc, char ** argv);
extern void fgParseOptions (const string &file_path);
extern void fgUsage ();