postgres.git / summary / log / commit / refs

commit    93c78ba19b378b4b54dad5ceb4fdf063bb0998e1
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Wed Dec 07 17:39:24 2016 +0000

    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.


 src/bin/psql/print.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index f45ce677d08..a1d2e9709d1 100644
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -2880,6 +2880,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();
 		}
 	}
 


[parent: 370c7a863aa7]