Commitb291c0f

committed

psql -f -

Adjust psql -f - to behave like a normal file and honor the -1 flag.Report from Robert Haas

1 parent0d32342 commitb291c0fCopy full SHA for b291c0f

File tree

+10

-5

lines changed

+10

-5

lines changed

Lines changed: 8 additions & 3 deletions

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/command.c,v 1.211 2009/11/22 05:20:41 tgl Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.212 2009/12/01 22:34:33 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"command.h"`
`@@ -1691,8 +1691,13 @@ process_file(char *filename, bool single_txn)`
`1691`	`1691`	`if (!filename)`
`1692`	`1692`	`returnEXIT_FAILURE;`
`1693`	`1693`
`1694`		`-canonicalize_path(filename);`
`1695`		`-fd=fopen(filename,PG_BINARY_R);`
	`1694`	`+if (strcmp(filename,"-")!=0)`
	`1695`	`+{`
	`1696`	`+canonicalize_path(filename);`
	`1697`	`+fd=fopen(filename,PG_BINARY_R);`
	`1698`	`+}`
	`1699`	`+else`
	`1700`	`+fd=stdin;`
`1696`	`1701`
`1697`	`1702`	`if (!fd)`
`1698`	`1703`	`{`

Lines changed: 2 additions & 2 deletions

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]);`

Comments

(0)