Error out on too many command-line arguments

petere · petere · commit 9684e4269549 · 2019-08-29T18:49:41.000+02:00
Fix up oid2name, pg_upgrade, and pgbench to error out on too many command-line arguments. This makes it match the behavior of other PostgreSQL programs. Author: Peter Eisentraut, Ibrar Ahmed Discussion: https://www.postgresql.org/message-id/flat/f2554627-04e7-383a-ef01-ab99bb6a291c%402ndquadrant.com
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
@@ -185,6 +185,14 @@ get_opts(int argc, char **argv, struct options *my_opts)
 				exit(1);
 		}
 	}
+
+	if (optind < argc)
+	{
+		fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
+				progname, argv[optind]);
+		fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
+		exit(1);
+	}
 }
 
 static void
diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
@@ -218,6 +218,9 @@ parseCommandLine(int argc, char *argv[])
 		}
 	}
 
+	if (optind < argc)
+		pg_fatal("too many command-line arguments (first is \"%s\")\n", argv[optind]);
+
 	if ((log_opts.internal = fopen_priv(INTERNAL_LOG_FILE, "a")) == NULL)
 		pg_fatal("could not open log file \"%s\": %m\n", INTERNAL_LOG_FILE);
 
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
@@ -5540,7 +5540,7 @@ main(int argc, char **argv)
 	throttle_delay *= nthreads;
 
 	if (argc > optind)
-		dbName = argv[optind];
+		dbName = argv[optind++];
 	else
 	{
 		if ((env = getenv("PGDATABASE")) != NULL && *env != '\0')
@@ -5551,6 +5551,14 @@ main(int argc, char **argv)
 			dbName = "";
 	}
 
+	if (optind < argc)
+	{
+		fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
+				progname, argv[optind]);
+		fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
+		exit(1);
+	}
+
 	if (is_init_mode)
 	{
 		if (benchmarking_option_set)

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`	`static void`
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`