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

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.

src/Main/fg_init.cxx

@@ -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;
 }

src/Main/options.cxx

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

src/Main/options.hxx

@@ -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 ();