psql -f -

bmomjian · bmomjian · commit b291c0fba83a · 2009-12-01T22:34:33.000Z
Adjust psql -f - to behave like a normal file and honor the -1 flag.

Report from Robert Haas
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.211 2009/11/22 05:20:41 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.212 2009/12/01 22:34:33 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "command.h"
@@ -1691,8 +1691,13 @@ process_file(char *filename, bool single_txn)
 	if (!filename)
 		return EXIT_FAILURE;
 
-	canonicalize_path(filename);
-	fd = fopen(filename, PG_BINARY_R);
+	if (strcmp(filename, "-") != 0)
+	{
+		canonicalize_path(filename);
+		fd = fopen(filename, PG_BINARY_R);
+	}
+	else
+		fd = stdin;
 
 	if (!fd)
 	{
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.156 2009/04/05 04:19:58 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.157 2009/12/01 22:34:33 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -225,7 +225,7 @@ main(int argc, char *argv[])
 	/*
 	 * process file given by -f
 	 */
-	if (options.action == ACT_FILE && strcmp(options.action_string, "-") != 0)
+	if (options.action == ACT_FILE)
 	{
 		if (!options.no_psqlrc)
 			process_psqlrc(argv[0]);

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2009, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.156 2009/04/05 04:19:58 tgl Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.157 2009/12/01 22:34:33 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`
`@@ -225,7 +225,7 @@ main(int argc, char *argv[])`
`225`	`225`	`/*`
`226`	`226`	`* process file given by -f`
`227`	`227`	`*/`
`228`		`- if (options.action == ACT_FILE && strcmp(options.action_string, "-") != 0)`
	`228`	`+ if (options.action == ACT_FILE)`
`229`	`229`	`{`
`230`	`230`	`if (!options.no_psqlrc)`
`231`	`231`	`process_psqlrc(argv[0]);`