Revert recent commit re positional arguments.

src/bin/initdb/initdb.c

@@ -2612,11 +2612,8 @@ main(int argc, char *argv[])
 	}
 
 
-	/* 
+	/* Non-option argument specifies data directory */
-	 * Non-option argument specifies data directory
+	if (optind < argc)
-	 * as long as it wasn't already specified with -D / --pgdata
-	 */
-	if (optind < argc && strlen(pg_data) == 0)
 	{
 		pg_data = xstrdup(argv[optind]);
 		optind++;

src/bin/scripts/clusterdb.c

@@ -106,18 +106,14 @@ main(int argc, char *argv[])
 		}
 	}
 
-	/* 
+	switch (argc - optind)
-	 * Non-option argument specifies database name
-	 * as long as it wasn't already specified with -d / --dbname
-	 */
-	if (optind < argc && dbname == NULL)
 	{
+		case 0:
+			break;
+		case 1:
 			dbname = argv[optind];
-		optind++;
+			break;
-	}
+		default:
-
-	if (optind < argc)
-	{
 			fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
 					progname, argv[optind + 1]);
 			fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);

src/bin/scripts/createlang.c

@@ -91,24 +91,14 @@ main(int argc, char *argv[])
 		}
 	}
 
-	/*
-	 * We set dbname from positional arguments if it is not
-	 * already set by option arguments -d. If not doing
-	 * listlangs, positional dbname must follow positional
-	 * langname.
-	 */
-
 	if (argc - optind > 0)
 	{
 		if (listlangs)
-		{
-			if (dbname == NULL)
 			dbname = argv[optind++];
-		}
 		else
 		{
 			langname = argv[optind++];
-			if (argc - optind > 0 && dbname == NULL)
+			if (argc - optind > 0)
 				dbname = argv[optind++];
 		}
 	}

src/bin/scripts/droplang.c

@@ -102,24 +102,14 @@ main(int argc, char *argv[])
 		}
 	}
 
-	/*
-	 * We set dbname from positional arguments if it is not
-	 * already set by option arguments -d. If not doing
-	 * listlangs, positional dbname must follow positional
-	 * langname.
-	 */
-
 	if (argc - optind > 0)
 	{
 		if (listlangs)
-		{
-			if (dbname == NULL)
 			dbname = argv[optind++];
-		}
 		else
 		{
 			langname = argv[optind++];
-			if (argc - optind > 0 && dbname == NULL)
+			if (argc - optind > 0)
 				dbname = argv[optind++];
 		}
 	}

src/bin/scripts/reindexdb.c

@@ -116,20 +116,15 @@ main(int argc, char *argv[])
 		}
 	}
 
-	/* 
+	switch (argc - optind)
-	 * Non-option argument specifies database name
-	 * as long as it wasn't already specified with -d / --dbname
-	 */
-	if (optind < argc && dbname == NULL)
 	{
+		case 0:
+			break;
+		case 1:
 			dbname = argv[optind];
-		optind++;
+			break;
-	}
+		default:
-
+			fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"), progname, argv[optind + 1]);
-	if (optind < argc)
-	{
-		fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
-				progname, argv[optind + 1]);
 			fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
 			exit(1);
 	}

src/bin/scripts/vacuumdb.c

@@ -123,19 +123,14 @@ main(int argc, char *argv[])
 		}
 	}
 
-	
+	switch (argc - optind)
-	/* 
-	 * Non-option argument specifies database name
-	 * as long as it wasn't already specified with -d / --dbname
-	 */
-	if (optind < argc && dbname == NULL)
 	{
+		case 0:
+			break;
+		case 1:
 			dbname = argv[optind];
-		optind++;
+			break;
-	}
+		default:
-
-	if (optind < argc)
-	{
 			fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
 					progname, argv[optind + 1]);
 			fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);