diff options
| author | Robert Haas <rhaas@postgresql.org> | 2012-09-06 15:43:46 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2012-09-06 15:52:19 -0400 |
| commit | ee121a6473c00d0c791e3ed1c2f8e555e66a0ea0 (patch) | |
| tree | e90ae5ca6d55f0d7f4f9aeb818eeb486d1219a10 | |
| parent | 1bc414ca7642bf32be80fcbe4760fca0307d2e12 (diff) | |
| download | postgresql-ee121a6473c00d0c791e3ed1c2f8e555e66a0ea0.tar.gz postgresql-ee121a6473c00d0c791e3ed1c2f8e555e66a0ea0.zip | |
Fix "too many arguments" messages not to index off the end of argv[].
This affects initdb, clusterdb, reindexdb, and vacuumdb in master
and 9.2; in earlier branches, only initdb is affected.
| -rw-r--r-- | src/bin/initdb/initdb.c | 2 | ||||
| -rw-r--r-- | src/bin/scripts/clusterdb.c | 2 | ||||
| -rw-r--r-- | src/bin/scripts/reindexdb.c | 2 | ||||
| -rw-r--r-- | src/bin/scripts/vacuumdb.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index f70846af184..74046b5dfea 100644 --- 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 index 05b726d68ea..b8ac6759b48 100644 --- 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 index 5b56656f001..d1e27bdb5f7 100644 --- 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 index fbc132caa91..0ac6ab4ed59 100644 --- 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); } |