From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 7 Dec 2016 17:39:24 +0000 (-0500)
Subject: Restore psql's SIGPIPE setting if popen() fails.
X-Git-Tag: REL9_2_20~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=311bc147ff0924b651f36910925a163c4f3b4a6c;p=postgresql

Restore psql's SIGPIPE setting if popen() fails.

Ancient oversight in PageOutput(): if popen() fails, we'd better reset
the SIGPIPE handler before returning stdout, because ClosePager() won't.
Noticed while fixing the empty-PAGER issue.
---

diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index bf5f4ff567..8809cfa8b8 100644
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -2087,6 +2087,10 @@ PageOutput(int lines, unsigned short int pager)
 			pagerpipe = popen(pagerprog, "w");
 			if (pagerpipe)
 				return pagerpipe;
+			/* if popen fails, silently proceed without pager */
+#ifndef WIN32
+			pqsignal(SIGPIPE, SIG_DFL);
+#endif
 #ifdef TIOCGWINSZ
 		}
 #endif