Use isatty() test for pager on Win32; not sure why it was disabled for

bmomjian · bmomjian · commit 265f19d78bb3 · 2008-05-17T23:34:44.000Z
that platform.
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.105 2008/05/17 21:40:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.106 2008/05/17 23:34:44 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -1912,13 +1912,7 @@ FILE *
 PageOutput(int lines, unsigned short int pager)
 {
 	/* check whether we need / can / are supposed to use pager */
-	if (pager
-#ifndef WIN32
-		&&
-		isatty(fileno(stdin)) &&
-		isatty(fileno(stdout))
-#endif
-		)
+	if (pager && isatty(fileno(stdin)) && isatty(fileno(stdout)))
 	{
 		const char *pagerprog;
 		FILE	   *pagerpipe;
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
@@ -10,7 +10,7 @@
  * didn't really belong there.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-print.c,v 1.75 2008/01/01 19:46:00 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-print.c,v 1.76 2008/05/17 23:34:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -147,13 +147,8 @@ PQprint(FILE *fout, const PGresult *res, const PQprintOpt *po)
 
 		if (fout == NULL)
 			fout = stdout;
-		if (po->pager && fout == stdout
-#ifndef WIN32
-			&&
-			isatty(fileno(stdin)) &&
-			isatty(fileno(stdout))
-#endif
-			)
+		if (po->pager && fout == stdout && isatty(fileno(stdin)) &&
+			isatty(fileno(stdout)))
 		{
 			/*
 			 * If we think there'll be more than one screen of output, try to

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.105 2008/05/17 21:40:44 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.106 2008/05/17 23:34:44 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`
`@@ -1912,13 +1912,7 @@ FILE *`
`1912`	`1912`	`PageOutput(int lines, unsigned short int pager)`
`1913`	`1913`	`{`
`1914`	`1914`	`/* check whether we need / can / are supposed to use pager */`
`1915`		`- if (pager`
`1916`		`-#ifndef WIN32`
`1917`		`- &&`
`1918`		`- isatty(fileno(stdin)) &&`
`1919`		`- isatty(fileno(stdout))`
`1920`		`-#endif`
`1921`		`- )`
	`1915`	`+ if (pager && isatty(fileno(stdin)) && isatty(fileno(stdout)))`
`1922`	`1916`	`{`
`1923`	`1917`	`const char *pagerprog;`
`1924`	`1918`	`FILE *pagerpipe;`