|
3 | 3 | *
|
4 | 4 | * Copyright (c) 2000-2008, PostgreSQL Global Development Group
|
5 | 5 | *
|
6 |
| - * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.150 2008/07/18 17:19:55 momjian Exp $ |
| 6 | + * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.151 2008/07/20 06:08:38 momjian Exp $ |
7 | 7 | */
|
8 | 8 | #include"postgres_fe.h"
|
9 | 9 |
|
@@ -281,14 +281,12 @@ main(int argc, char *argv[])
|
281 | 281 | */
|
282 | 282 | else
|
283 | 283 | {
|
284 |
| -connection_warnings(); |
285 |
| -if (!pset.quiet&& !pset.notty) |
286 |
| -printf(_("Type \"help\" for help.\n")); |
287 | 284 | if (!options.no_psqlrc)
|
288 | 285 | process_psqlrc(argv[0]);
|
289 |
| -/* output newline here because .psqlrc might output something */ |
| 286 | + |
| 287 | +connection_warnings(); |
290 | 288 | if (!pset.quiet&& !pset.notty)
|
291 |
| -printf("\n"); |
| 289 | +printf(_("Type \"help\" for help.\n\n")); |
292 | 290 | if (!pset.notty)
|
293 | 291 | initializeInput(options.no_readline ?0 :1);
|
294 | 292 | if (options.action_string)/* -f - was used */
|
|