Fix pg_restore to complain if any arguments remain after parsing the switches

tglsfdc · tglsfdc · commit e4155c848308 · 2010-08-13T14:38:04.000Z
and input file name, per bug #5617 from Leo Shklovskii.  Rearrange the
corresponding code in pg_dump and pg_dumpall so that all three programs
handle this in a consistent, straightforward fashion.

Back-patch to 9.0, but no further.  Although this is certainly a bug, it's
possible that people have scripts that will be broken by the added error
check, so it seems better not to change the behavior in stable branches.
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -25,7 +25,7 @@
  *	http://archives.postgresql.org/pgsql-bugs/2010-02/msg00187.php
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.584 2010/08/03 19:24:04 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.585 2010/08/13 14:38:03 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -480,19 +480,20 @@ main(int argc, char **argv)
 		}
 	}
 
-	if (optind < (argc - 1))
+	/* Get database name from command line */
+	if (optind < argc)
+		dbname = argv[optind++];
+
+	/* Complain if any arguments remain */
+	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);
 	}
 
-	/* Get database name from command line */
-	if (optind < argc)
-		dbname = argv[optind];
-
 	/* --column-inserts implies --inserts */
 	if (column_inserts)
 		dump_inserts = 1;
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.137 2010/08/03 19:24:05 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.138 2010/08/13 14:38:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -316,24 +316,7 @@ main(int argc, char *argv[])
 		}
 	}
 
-	/* Add long options to the pg_dump argument list */
-	if (binary_upgrade)
-		appendPQExpBuffer(pgdumpopts, " --binary-upgrade");
-	if (column_inserts)
-		appendPQExpBuffer(pgdumpopts, " --column-inserts");
-	if (disable_dollar_quoting)
-		appendPQExpBuffer(pgdumpopts, " --disable-dollar-quoting");
-	if (disable_triggers)
-		appendPQExpBuffer(pgdumpopts, " --disable-triggers");
-	if (inserts)
-		appendPQExpBuffer(pgdumpopts, " --inserts");
-	if (no_tablespaces)
-		appendPQExpBuffer(pgdumpopts, " --no-tablespaces");
-	if (quote_all_identifiers)
-		appendPQExpBuffer(pgdumpopts, " --quote-all-identifiers");
-	if (use_setsessauth)
-		appendPQExpBuffer(pgdumpopts, " --use-set-session-authorization");
-
+	/* Complain if any arguments remain */
 	if (optind < argc)
 	{
 		fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
@@ -371,6 +354,24 @@ main(int argc, char *argv[])
 		exit(1);
 	}
 
+	/* Add long options to the pg_dump argument list */
+	if (binary_upgrade)
+		appendPQExpBuffer(pgdumpopts, " --binary-upgrade");
+	if (column_inserts)
+		appendPQExpBuffer(pgdumpopts, " --column-inserts");
+	if (disable_dollar_quoting)
+		appendPQExpBuffer(pgdumpopts, " --disable-dollar-quoting");
+	if (disable_triggers)
+		appendPQExpBuffer(pgdumpopts, " --disable-triggers");
+	if (inserts)
+		appendPQExpBuffer(pgdumpopts, " --inserts");
+	if (no_tablespaces)
+		appendPQExpBuffer(pgdumpopts, " --no-tablespaces");
+	if (quote_all_identifiers)
+		appendPQExpBuffer(pgdumpopts, " --quote-all-identifiers");
+	if (use_setsessauth)
+		appendPQExpBuffer(pgdumpopts, " --use-set-session-authorization");
+
 	/*
 	 * If there was a database specified on the command line, use that,
 	 * otherwise try to connect to database "postgres", and failing that
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
@@ -34,7 +34,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.102 2010/05/15 21:41:16 tgl Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.103 2010/08/13 14:38:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -295,11 +295,22 @@ main(int argc, char **argv)
 		}
 	}
 
+	/* Get file name from command line */
 	if (optind < argc)
-		inputFileSpec = argv[optind];
+		inputFileSpec = argv[optind++];
 	else
 		inputFileSpec = NULL;
 
+	/* Complain if any arguments remain */
+	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);
+	}
+
 	/* Should get at most one of -d and -f, else user is confused */
 	if (opts->dbname)
 	{

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`* http://archives.postgresql.org/pgsql-bugs/2010-02/msg00187.php`
`26`	`26`	`*`
`27`	`27`	`* IDENTIFICATION`
`28`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.584 2010/08/03 19:24:04 tgl Exp $`
	`28`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.585 2010/08/13 14:38:03 tgl Exp $`
`29`	`29`	`*`
`30`	`30`	`*-------------------------------------------------------------------------`
`31`	`31`	`*/`
`@@ -480,19 +480,20 @@ main(int argc, char **argv)`
`480`	`480`	`}`
`481`	`481`	`}`
`482`	`482`
`483`		`- if (optind < (argc - 1))`
	`483`	`+ /* Get database name from command line */`
	`484`	`+ if (optind < argc)`
	`485`	`+ dbname = argv[optind++];`
	`486`	`+`
	`487`	`+ /* Complain if any arguments remain */`
	`488`	`+ if (optind < argc)`
`484`	`489`	`{`
`485`	`490`	`fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),`
`486`		`- progname, argv[optind + 1]);`
	`491`	`+ progname, argv[optind]);`
`487`	`492`	`fprintf(stderr, _("Try \"%s --help\" for more information.\n"),`
`488`	`493`	`progname);`
`489`	`494`	`exit(1);`
`490`	`495`	`}`
`491`	`496`
`492`		`- /* Get database name from command line */`
`493`		`- if (optind < argc)`
`494`		`- dbname = argv[optind];`
`495`		`-`
`496`	`497`	`/* --column-inserts implies --inserts */`
`497`	`498`	`if (column_inserts)`
`498`	`499`	`dump_inserts = 1;`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`*`
`35`	`35`	`*`
`36`	`36`	`* IDENTIFICATION`
`37`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.102 2010/05/15 21:41:16 tgl Exp $`
	`37`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.103 2010/08/13 14:38:04 tgl Exp $`
`38`	`38`	`*`
`39`	`39`	`*-------------------------------------------------------------------------`
`40`	`40`	`*/`
`@@ -295,11 +295,22 @@ main(int argc, char **argv)`
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`
	`298`	`+ /* Get file name from command line */`
`298`	`299`	`if (optind < argc)`
`299`		`- inputFileSpec = argv[optind];`
	`300`	`+ inputFileSpec = argv[optind++];`
`300`	`301`	`else`
`301`	`302`	`inputFileSpec = NULL;`
`302`	`303`
	`304`	`+ /* Complain if any arguments remain */`
	`305`	`+ if (optind < argc)`
	`306`	`+ {`
	`307`	`+ fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),`
	`308`	`+ progname, argv[optind]);`
	`309`	`+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"),`
	`310`	`+ progname);`
	`311`	`+ exit(1);`
	`312`	`+ }`
	`313`	`+`
`303`	`314`	`/* Should get at most one of -d and -f, else user is confused */`
`304`	`315`	`if (opts->dbname)`
`305`	`316`	`{`