From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 27 Aug 2015 22:13:34 +0000 (+0200)
Subject: pager: also redirect stderr
X-Git-Tag: v226.4~1^2~107
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c08fa87433a5cb3fefefcadb570d03fc6f83dfbb;hp=2fa742f34291f19d73e6c8d575f97946b8c941e7

pager: also redirect stderr

It's really confusing if stdout goes to the pager, but stderr is written
directly to the screen. Hence, make sure both stdout and stderr are
passed to the pager when doing autopaging.
---

diff --git a/src/shared/pager.c b/src/shared/pager.c
index d6474030c..1c1cf1605 100644
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -129,6 +129,8 @@ int pager_open(bool jump_to_end) {
         /* Return in the parent */
         if (dup2(fd[1], STDOUT_FILENO) < 0)
                 return log_error_errno(errno, "Failed to duplicate pager pipe: %m");
+        if (dup2(fd[1], STDERR_FILENO) < 0)
+                return log_error_errno(errno, "Failed to duplicate pager pipe: %m");
 
         safe_close_pair(fd);
         return 1;
@@ -141,6 +143,11 @@ void pager_close(void) {
 
         /* Inform pager that we are done */
         fclose(stdout);
+        stdout = NULL;
+
+        fclose(stderr);
+        stderr = NULL;
+
         kill(pager_pid, SIGCONT);
         (void) wait_for_terminate(pager_pid, NULL);
         pager_pid = 0;