Make psql use pager only when it has a tty.

bmomjian · bmomjian · commit 76501c8aed9e · 1997-08-22T00:17:26.000Z
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.84 1997/08/19 21:36:51 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.85 1997/08/22 00:17:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -157,7 +157,9 @@ slashUsage(PsqlSettings * ps)
     char *pagerenv;
     FILE *fout;
 
-    if ((pagerenv = getenv("PAGER")) && (pagerenv[0] != '\0') && \
+    if 	(settings.notty == 0 &&
+	(pagerenv = getenv("PAGER")) &&
+	(pagerenv[0] != '\0') &&
 	(fout = popen(pagerenv, "w")))
     {
 	usePipe = 1;
@@ -1047,6 +1049,7 @@ do_help(const char *topic)
 	FILE *fout;
 
 	if (strcmp(topic, "*") == 0 &&
+	    (settings.notty == 0) &&
 	    (pagerenv = getenv("PAGER")) &&
 	    (pagerenv[0] != '\0') &&
 	    (fout = popen(pagerenv, "w")))

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.84 1997/08/19 21:36:51 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.85 1997/08/22 00:17:26 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -157,7 +157,9 @@ slashUsage(PsqlSettings * ps)`
`157`	`157`	`char *pagerenv;`
`158`	`158`	`FILE *fout;`
`159`	`159`
`160`		`- if ((pagerenv = getenv("PAGER")) && (pagerenv[0] != '\0') && \`
	`160`	`+ if (settings.notty == 0 &&`
	`161`	`+ (pagerenv = getenv("PAGER")) &&`
	`162`	`+ (pagerenv[0] != '\0') &&`
`161`	`163`	`(fout = popen(pagerenv, "w")))`
`162`	`164`	`{`
`163`	`165`	`usePipe = 1;`
`@@ -1047,6 +1049,7 @@ do_help(const char *topic)`
`1047`	`1049`	`FILE *fout;`
`1048`	`1050`
`1049`	`1051`	`if (strcmp(topic, "*") == 0 &&`
	`1052`	`+ (settings.notty == 0) &&`
`1050`	`1053`	`(pagerenv = getenv("PAGER")) &&`
`1051`	`1054`	`(pagerenv[0] != '\0') &&`
`1052`	`1055`	`(fout = popen(pagerenv, "w")))`