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

bmomjian · bmomjian · commit e2cd62c3e1e6 · 2008-05-17T21:40:44.000Z
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
@@ -3,7 +3,7 @@
  *
  * 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"
 
@@ -634,7 +634,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout)
 	}
 
 	/* 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))
 	{
 		fout = PageOutput(INT_MAX, cont->opt->pager);	/* force pager */

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