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

robertmhaas · robertmhaas · commit ee121a6473c0 · 2012-09-06T15:52:19.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
@@ -2780,7 +2780,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);
diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
@@ -125,7 +125,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);
 	}
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
@@ -135,7 +135,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);
 	}
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
@@ -149,7 +149,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
`@@ -2780,7 +2780,7 @@ main(int argc, char *argv[])`
`2780`	`2780`	`if (optind < argc)`
`2781`	`2781`	`{`
`2782`	`2782`	`fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),`
`2783`		`- progname, argv[optind + 1]);`
	`2783`	`+ progname, argv[optind]);`
`2784`	`2784`	`fprintf(stderr, _("Try \"%s --help\" for more information.\n"),`
`2785`	`2785`	`progname);`
`2786`	`2786`	`exit(1);`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ main(int argc, char *argv[])`
`125`	`125`	`if (optind < argc)`
`126`	`126`	`{`
`127`	`127`	`fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),`
`128`		`- progname, argv[optind + 1]);`
	`128`	`+ progname, argv[optind]);`
`129`	`129`	`fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);`
`130`	`130`	`exit(1);`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ main(int argc, char *argv[])`
`135`	`135`	`if (optind < argc)`
`136`	`136`	`{`
`137`	`137`	`fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),`
`138`		`- progname, argv[optind + 1]);`
	`138`	`+ progname, argv[optind]);`
`139`	`139`	`fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);`
`140`	`140`	`exit(1);`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ main(int argc, char *argv[])`
`149`	`149`	`if (optind < argc)`
`150`	`150`	`{`
`151`	`151`	`fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),`
`152`		`- progname, argv[optind + 1]);`
	`152`	`+ progname, argv[optind]);`
`153`	`153`	`fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);`
`154`	`154`	`exit(1);`
`155`	`155`	`}`