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.

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index f70846af1842d4be78e79685cc28f3ab196b493e..74046b5dfea14212e499fead39321821e75b040e 100644 (file)
--- 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 05b726d68ead871aa3dcb50a6c9cf135b5d3e7b4..b8ac6759b489df57df38ad7d098a1f667321ea83 100644 (file)
--- 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 5b56656f0010c2e4982b7368a85fa405c631a6d4..d1e27bdb5f73b63efef9b0f1fed1a26b9f733f1e 100644 (file)
--- 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 fbc132caa91bfb8c0e93a85002c30b016af8a174..0ac6ab4ed592d8737f169bedc76def22339e65cf 100644 (file)
--- 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);
        }