mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Error out on too many command-line arguments 

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
This commit is contained in:
Peter Eisentraut 2019-08-29 16:19:35 +02:00
parent 317b3d7ae2
commit 9684e42695
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/oid2name/oid2name.c
View File

@ -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

3
src/bin/pg_upgrade/option.c
View File

@ -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);

10
src/bin/pgbench/pgbench.c
View File

@ -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)