diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2001-05-06 17:38:32 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2001-05-06 17:38:32 +0000 |
| commit | 7038554c4ef2149ec08d4fdaff04743d5153873b (patch) | |
| tree | 55ec209340c47f03dca402d026e60d8a1294d2e5 /src | |
| parent | 84e8e5b42798227d1105cd6dc0dda25edbee5418 (diff) | |
| download | postgresql-7038554c4ef2149ec08d4fdaff04743d5153873b.tar.gz postgresql-7038554c4ef2149ec08d4fdaff04743d5153873b.zip | |
Allow 'psql -f -' to read from standard input.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/psql/startup.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 5729b3e27e5..3d38afaf6ba 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.46 2001/03/23 00:36:38 tgl Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.47 2001/05/06 17:38:32 petere Exp $ */ #include "postgres_fe.h" @@ -230,7 +230,7 @@ main(int argc, char *argv[]) /* * process file given by -f */ - if (options.action == ACT_FILE) + if (options.action == ACT_FILE && strcmp(options.action_string, "-")!=0) { if (!options.no_psqlrc) process_psqlrc(); @@ -290,6 +290,8 @@ main(int argc, char *argv[]) process_psqlrc(); if (!pset.notty) initializeInput(options.no_readline ? 0 : 1); + if (options.action_string) /* -f - was used */ + pset.inputfile = "<stdin>"; successResult = MainLoop(stdin); } |