Commit 38275558 authored by Bruce Momjian's avatar Bruce Momjian

Fix notty output to show status result. -q option still turns it off.

parent ad43a721
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.120 1997/12/06 22:57:36 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.121 1997/12/22 20:03:53 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -994,9 +994,7 @@ SendQuery(bool *success_p, PsqlSettings *pset, const char *query, ...@@ -994,9 +994,7 @@ SendQuery(bool *success_p, PsqlSettings *pset, const char *query,
case PGRES_COPY_OUT: case PGRES_COPY_OUT:
*success_p = true; *success_p = true;
if (copy_out) if (copy_out)
{
handleCopyOut(results, pset->quiet, copystream); handleCopyOut(results, pset->quiet, copystream);
}
else else
{ {
if (!pset->quiet) if (!pset->quiet)
...@@ -2372,7 +2370,7 @@ main(int argc, char **argv) ...@@ -2372,7 +2370,7 @@ main(int argc, char **argv)
settings.opt.fieldSep = strdup(DEFAULT_FIELD_SEP); settings.opt.fieldSep = strdup(DEFAULT_FIELD_SEP);
settings.opt.pager = 1; settings.opt.pager = 1;
if (!isatty(0) || !isatty(1)) if (!isatty(0) || !isatty(1))
settings.quiet = settings.notty = 1; settings.notty = 1;
#ifdef HAVE_LIBREADLINE #ifdef HAVE_LIBREADLINE
else else
settings.useReadline = 1; settings.useReadline = 1;
...@@ -2494,7 +2492,7 @@ main(int argc, char **argv) ...@@ -2494,7 +2492,7 @@ main(int argc, char **argv)
{ {
exit(listAllDbs(&settings)); exit(listAllDbs(&settings));
} }
if (!settings.quiet && !singleQuery && !qfilename) if (!settings.quiet && !settings.notty && !singleQuery && !qfilename)
{ {
printf("Welcome to the POSTGRESQL interactive sql monitor:\n"); printf("Welcome to the POSTGRESQL interactive sql monitor:\n");
printf(" Please read the file COPYRIGHT for copyright terms " printf(" Please read the file COPYRIGHT for copyright terms "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment