Commit265f19d

committed

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

that platform.

1 parente2cd62c commit265f19dCopy full SHA for 265f19d

File tree

-16

lines changed

-16

lines changed

Lines changed: 2 additions & 8 deletions

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/1721:40:44 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.106 2008/05/1723:34:44 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`
`@@ -1912,13 +1912,7 @@ FILE *`
`1912`	`1912`	`PageOutput(intlines,unsigned shortintpager)`
`1913`	`1913`	`{`
`1914`	`1914`	`/* check whether we need / can / are supposed to use pager */`
`1915`		`-if (pager`
`1916`		`-#ifndefWIN32`
`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`	`constchar*pagerprog;`
`1924`	`1918`	`FILE*pagerpipe;`

Lines changed: 3 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* didn't really belong there.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-print.c,v 1.75 2008/01/01 19:46:00 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-print.c,v 1.76 2008/05/17 23:34:44 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -147,13 +147,8 @@ PQprint(FILE fout, const PGresult res, const PQprintOpt *po)`
`147`	`147`
`148`	`148`	`if (fout==NULL)`
`149`	`149`	`fout=stdout;`
`150`		`-if (po->pager&&fout==stdout`
`151`		`-#ifndefWIN32`
`152`		`-&&`
`153`		`-isatty(fileno(stdin))&&`
`154`		`-isatty(fileno(stdout))`
`155`		`-#endif`
`156`		`-)`
	`150`	`+if (po->pager&&fout==stdout&&isatty(fileno(stdin))&&`
	`151`	`+isatty(fileno(stdout)))`
`157`	`152`	`{`
`158`	`153`	`/*`
`159`	`154`	`* If we think there'll be more than one screen of output, try to`

Comments

(0)