database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-11 10:01:57 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Bruce Momjian
1997-12-22 20:03:53 +00:00
parent ad43a7219c
commit 3827555869
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/psql/psql.c
View File

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