Fix "too many arguments" messages not to index off the end of argv[].

robertmhaas · robertmhaas · commit 83f2584f15d9 · 2012-09-06T15:52:11.000-04:00
This affects initdb, clusterdb, reindexdb, and vacuumdb in master
and 9.2; in earlier branches, only initdb is affected.
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -2573,7 +2573,7 @@ main(int argc, char *argv[])
 	if (optind < argc)
 	{
 		fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
-				progname, argv[optind + 1]);
+				progname, argv[optind]);
 		fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
 				progname);
 		exit(1);

Original file line number	Diff line number	Diff line change
`@@ -2573,7 +2573,7 @@ main(int argc, char *argv[])`
`2573`	`2573`	`if (optind < argc)`
`2574`	`2574`	`{`
`2575`	`2575`	`fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),`
`2576`		`- progname, argv[optind + 1]);`
	`2576`	`+ progname, argv[optind]);`
`2577`	`2577`	`fprintf(stderr, _("Try \"%s --help\" for more information.\n"),`
`2578`	`2578`	`progname);`
`2579`	`2579`	`exit(1);`