Commit9684e42

committed

Error out on too many command-line arguments

Fix up oid2name, pg_upgrade, and pgbench to error out on too manycommand-line arguments. This makes it match the behavior of otherPostgreSQL programs.Author: Peter Eisentraut, Ibrar AhmedDiscussion:https://www.postgresql.org/message-id/flat/f2554627-04e7-383a-ef01-ab99bb6a291c%402ndquadrant.com

1 parent317b3d7 commit9684e42Copy full SHA for 9684e42

File tree

+20

-1

lines changed

+20

-1

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,14 @@ get_opts(int argc, char *argv, struct options my_opts)`
`185`	`185`	`exit(1);`
`186`	`186`	`}`
`187`	`187`	`}`
	`188`	`+`
	`189`	`+if (optind<argc)`
	`190`	`+{`
	`191`	`+fprintf(stderr,_("%s: too many command-line arguments (first is \"%s\")\n"),`
	`192`	`+progname,argv[optind]);`
	`193`	`+fprintf(stderr,_("Try \"%s --help\" for more information.\n"),progname);`
	`194`	`+exit(1);`
	`195`	`+}`
`188`	`196`	`}`
`189`	`197`
`190`	`198`	`staticvoid`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,9 @@ parseCommandLine(int argc, char *argv[])`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`
	`221`	`+if (optind<argc)`
	`222`	`+pg_fatal("too many command-line arguments (first is \"%s\")\n",argv[optind]);`
	`223`	`+`
`221`	`224`	`if ((log_opts.internal=fopen_priv(INTERNAL_LOG_FILE,"a"))==NULL)`
`222`	`225`	`pg_fatal("could not open log file \"%s\": %m\n",INTERNAL_LOG_FILE);`
`223`	`226`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5540,7 +5540,7 @@ main(int argc, char **argv)`
`5540`	`5540`	`throttle_delay *=nthreads;`
`5541`	`5541`
`5542`	`5542`	`if (argc>optind)`
`5543`		`-dbName=argv[optind];`
	`5543`	`+dbName=argv[optind++];`
`5544`	`5544`	`else`
`5545`	`5545`	`{`
`5546`	`5546`	`if ((env=getenv("PGDATABASE"))!=NULL&&*env!='\0')`
`@@ -5551,6 +5551,14 @@ main(int argc, char **argv)`
`5551`	`5551`	`dbName="";`
`5552`	`5552`	`}`
`5553`	`5553`
	`5554`	`+if (optind<argc)`
	`5555`	`+{`
	`5556`	`+fprintf(stderr,_("%s: too many command-line arguments (first is \"%s\")\n"),`
	`5557`	`+progname,argv[optind]);`
	`5558`	`+fprintf(stderr,_("Try \"%s --help\" for more information.\n"),progname);`
	`5559`	`+exit(1);`
	`5560`	`+}`
	`5561`	`+`
`5554`	`5562`	`if (is_init_mode)`
`5555`	`5563`	`{`
`5556`	`5564`	`if (benchmarking_option_set)`

Comments

(0)