In psql, test for output to stdout when forcing pager for wide output.

This commit is contained in:
Bruce Momjian 2008-05-17 21:40:44 +00:00
parent 2413ac97e9
commit e2cd62c3e1

View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2008, PostgreSQL Global Development Group * Copyright (c) 2000-2008, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.104 2008/05/17 17:52:14 tgl Exp $ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.105 2008/05/17 21:40:44 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
@ -634,7 +634,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout)
} }
/* If we wrapped beyond the display width, use the pager */ /* If we wrapped beyond the display width, use the pager */
if (!is_pager && output_columns > 0 && if (!is_pager && fout == stdout && output_columns > 0 &&
(output_columns < total_header_width || output_columns < width_total)) (output_columns < total_header_width || output_columns < width_total))
{ {
fout = PageOutput(INT_MAX, cont->opt->pager); /* force pager */ fout = PageOutput(INT_MAX, cont->opt->pager); /* force pager */