X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=main.cc;h=bc8a08ec6f05b5c7848feb6d8d474db793add8b0;hp=64564012fa634f6281ee7d6834facd2ce4dc3da4;hb=cc2accafaceffae9593b64b9f526d6c8d6239bd4;hpb=1a2fb82a5c26ec83fb05d0fa208662cf98f4758b

diff --git a/main.cc b/main.cc
index 64564012..bc8a08ec 100644
--- a/main.cc
+++ b/main.cc
@@ -4,9 +4,7 @@
 
 #include <unistd.h>
 
-#include <threads.h>
 #include "common.h"
-#include "threads-model.h"
 #include "output.h"
 
 #include "datarace.h"
@@ -54,11 +52,11 @@ params->maxreads, params->maxfuturevalues, params->maxfuturedelay, params->expir
 	exit(EXIT_SUCCESS);
 }
 
-static void parse_options(struct model_params *params, int *argc, char ***argv) {
+static void parse_options(struct model_params *params, int argc, char **argv) {
 	const char *shortopts = "hm:M:s:S:f:e:b:v";
 	int opt;
 	bool error = false;
-	while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
+	while (!error && (opt = getopt(argc, argv, shortopts)) != -1) {
 		switch (opt) {
 		case 'h':
 			print_usage(params);
@@ -92,9 +90,15 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 			break;
 		}
 	}
-	(*argv)[optind - 1] = (*argv)[0];
-	(*argc) -= (optind - 1);
-	(*argv) += (optind - 1);
+
+	/* Pass remaining arguments to user program */
+	params->argc = argc - (optind - 1);
+	params->argv = argv + (optind - 1);
+
+	/* Reset program name */
+	params->argv[0] = argv[0];
+
+	/* Reset (global) optind for potential use by user program */
 	optind = 1;
 
 	if (error)
@@ -110,11 +114,7 @@ static void model_main() {
 
 	param_defaults(&params);
 
-	parse_options(&params, &main_argc, &main_argv);
-
-	/* Pass remaining arguments to user program */
-	params.argc = main_argc;
-	params.argv = main_argv;
+	parse_options(&params, main_argc, main_argv);
 
 	//Initialize race detector
 	initRaceDetector();