Commit0a1967a

committed

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

This affects initdb, clusterdb, reindexdb, and vacuumdb in masterand 9.2; in earlier branches, only initdb is affected.

1 parentd2286a9 commit0a1967aCopy full SHA for 0a1967a

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3012,7 +3012,7 @@ main(int argc, char *argv[])`
`3012`	`3012`	`if (optind<argc)`
`3013`	`3013`	`{`
`3014`	`3014`	`fprintf(stderr,_("%s: too many command-line arguments (first is \"%s\")\n"),`
`3015`		`-progname,argv[optind+1]);`
	`3015`	`+progname,argv[optind]);`
`3016`	`3016`	`fprintf(stderr,_("Try \"%s --help\" for more information.\n"),`
`3017`	`3017`	`progname);`
`3018`	`3018`	`exit(1);`

Lines changed: 1 addition & 1 deletion

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`	`}`

Lines changed: 1 addition & 1 deletion

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`	`}`

Lines changed: 1 addition & 1 deletion

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`	`}`

Comments

(0)