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: REL_10_BETA1~1289
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=b7e1ae2328f7d5a88d8916d78b4561d8ef16f99b;p=postgresql.git

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/fe_utils/print.c b/src/fe_utils/print.c
index 5c5d285be5f..daa23d1955a 100644
--- a/src/fe_utils/print.c
+++ b/src/fe_utils/print.c
@@ -2884,6 +2884,8 @@ PageOutput(int lines, const printTableOpt *topt)
 			pagerpipe = popen(pagerprog, "w");
 			if (pagerpipe)
 				return pagerpipe;
+			/* if popen fails, silently proceed without pager */
+			restore_sigpipe_trap();
 		}
 	}