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

tglsfdc · tglsfdc · commit b7e1ae2328f7 · 2016-12-07T12:39:24.000-05:00
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
@@ -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();
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2884,6 +2884,8 @@ PageOutput(int lines, const printTableOpt *topt)`
`2884`	`2884`	`pagerpipe = popen(pagerprog, "w");`
`2885`	`2885`	`if (pagerpipe)`
`2886`	`2886`	`return pagerpipe;`
	`2887`	`+ /* if popen fails, silently proceed without pager */`
	`2888`	`+ restore_sigpipe_trap();`
`2887`	`2889`	`}`
`2888`	`2890`	`}`
`2889`	`2891`