From: Brian Norris <banorris@uci.edu>
Date: Sun, 4 Nov 2012 01:16:19 +0000 (-0700)
Subject: Merge branch 'master' into pldi13
X-Git-Tag: pldi2013~13
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2e067c102b91db06977412388b69d06a0c0b7166;hp=-c;p=model-checker.git

Merge branch 'master' into pldi13
---

2e067c102b91db06977412388b69d06a0c0b7166
diff --combined main.cc
index 635b8da,8a17a18..e8d4f9a
--- a/main.cc
+++ b/main.cc
@@@ -23,6 -23,9 +23,9 @@@ static void param_defaults(struct model
  }
  
  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,10 -75,8 +75,10 @@@ static void parse_options(struct model_
  			break;
  		}
  	}
 -	(*argc) -= optind;
 -	(*argv) += optind;
 +	(*argv)[optind - 1] = (*argv)[0];
 +	(*argc) -= (optind - 1);
 +	(*argv) += (optind - 1);
 +	optind = 1;
  
  	if (error)
  		print_usage(params);