diff options
| author | Bruce Momjian <bruce@momjian.us> | 2008-07-20 06:08:38 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2008-07-20 06:08:38 +0000 |
| commit | b133ceb77d0c5429cce5d6adcd7438560965ee12 (patch) | |
| tree | 7ee06178918b63a906575f19ef390c65ef84b1ea /src | |
| parent | 4b362c662e35c0edd6ed66523f94ebfe9f466329 (diff) | |
| download | postgresql-b133ceb77d0c5429cce5d6adcd7438560965ee12.tar.gz postgresql-b133ceb77d0c5429cce5d6adcd7438560965ee12.zip | |
Revert patch so .psqlrc can suppress startup banner:
In psql, run .psqlrc _after_ printing warnings and banner.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/psql/startup.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index bb82dfb5c4b..b18eb445184 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2008, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.150 2008/07/18 17:19:55 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.151 2008/07/20 06:08:38 momjian Exp $ */ #include "postgres_fe.h" @@ -281,14 +281,12 @@ main(int argc, char *argv[]) */ else { - connection_warnings(); - if (!pset.quiet && !pset.notty) - printf(_("Type \"help\" for help.\n")); if (!options.no_psqlrc) process_psqlrc(argv[0]); - /* output newline here because .psqlrc might output something */ + + connection_warnings(); if (!pset.quiet && !pset.notty) - printf("\n"); + printf(_("Type \"help\" for help.\n\n")); if (!pset.notty) initializeInput(options.no_readline ? 0 : 1); if (options.action_string) /* -f - was used */ |