database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-22 23:02:54 +03:00
Code

psql -f -

Browse Source 
Adjust psql -f - to behave like a normal file and honor the -1 flag.

Report from Robert Haas
This commit is contained in:
Bruce Momjian 2009-12-01 22:34:33 +00:00
parent 0d32342501
commit b291c0fba8
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/psql/command.c
View File

@ -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)
{

4
src/bin/psql/startup.c
View File

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