X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=e8d4f9af356f4ac6a59ab21f69fc26d6bd2d12bb;hb=2e067c102b91db06977412388b69d06a0c0b7166;hp=fc1b2779daa657ae6460293da49d29a5c95ec21d;hpb=4546308ab989c074f83d8607e16f13ffbcff494a;p=model-checker.git

diff --git a/main.cc b/main.cc
index fc1b277..e8d4f9a 100644
--- a/main.cc
+++ b/main.cc
@@ -23,6 +23,9 @@ static void param_defaults(struct model_params * params) {
 }
 
 static void print_usage(struct model_params *params) {
+	/* Reset defaults before printing */
+	param_defaults(params);
+
 	printf(
 "Usage: <program name> [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n"
 "\n"
@@ -72,8 +75,10 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 			break;
 		}
 	}
-	(*argc) -= optind;
-	(*argv) += optind;
+	(*argv)[optind - 1] = (*argv)[0];
+	(*argc) -= (optind - 1);
+	(*argv) += (optind - 1);
+	optind = 1;
 
 	if (error)
 		print_usage(params);