[PATCH 1/4] pager: save the original stderr when redirecting to pager
From: Jeff King <hidden>
Date: 2016-06-15 22:50:52
Subsystem:
the rest · Maintainer:
Linus Torvalds
When we redirect stdout to the pager, we also redirect stderr (if it would otherwise go to the terminal) so that error messages do not get overwritten by the pager. However, some stderr output may still want to go to the terminal, because they are time-sensitive (like progress reports) and should be overwritten by the pager. This patch stashes away the original stderr descriptor and creates a new stdio buffer for it. Signed-off-by: Jeff King <redacted> --- Same as the last iteration. cache.h | 2 ++ pager.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/cache.h b/cache.h
index f765cf5..73da139 100644
--- a/cache.h
+++ b/cache.h@@ -1068,6 +1068,8 @@ extern int pager_use_color; extern const char *editor_program; extern const char *askpass_program; extern const char *excludes_file; +extern FILE *original_stderr; +extern int original_stderr_fd; /* base85 */ int decode_85(char *dst, const char *line, int linelen);
diff --git a/pager.c b/pager.c
index dac358f..701926f 100644
--- a/pager.c
+++ b/pager.c@@ -12,6 +12,8 @@ */ static int spawned_pager; +FILE *original_stderr; +int original_stderr_fd = -1; #ifndef WIN32 static void pager_preexec(void)
@@ -97,8 +99,11 @@ void setup_pager(void) /* original process continues, but writes to the pipe */ dup2(pager_process.in, 1); - if (isatty(2)) + if (isatty(2)) { + original_stderr_fd = dup(2); + original_stderr = fdopen(original_stderr_fd, "w"); dup2(pager_process.in, 2); + } close(pager_process.in); /* this makes sure that the parent terminates after the pager */
--
1.7.4.41.g423da