pager: also redirect stderr

[elogind.git] / src / shared / pager.c

diff --git a/src/shared/pager.c b/src/shared/pager.c
index b2635740f2ae4430887fc5a168e776394806c508..1c1cf1605a1db7db71ba0f90ab993a584f60a387 100644 (file)
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -31,18 +31,16 @@
 #include "macro.h"
 #include "terminal-util.h"
 #include "signal-util.h"
 #include "macro.h"
 #include "terminal-util.h"
 #include "signal-util.h"

+#include "copy.h"

 
 static pid_t pager_pid = 0;
 
 noreturn static void pager_fallback(void) {
 
 static pid_t pager_pid = 0;
 
 noreturn static void pager_fallback(void) {

-        ssize_t n;
-
-        do {
-                n = splice(STDIN_FILENO, NULL, STDOUT_FILENO, NULL, 64*1024, 0);
-        } while (n > 0);
+        int r;

 
 

-        if (n < 0) {
-                log_error_errno(errno, "Internal pager failed: %m");
+        r = copy_bytes(STDIN_FILENO, STDOUT_FILENO, (off_t) -1, false);
+        if (r < 0) {
+                log_error_errno(r, "Internal pager failed: %m");

                 _exit(EXIT_FAILURE);
         }
 
                 _exit(EXIT_FAILURE);
         }
 


@@ -131,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");
         /* 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;
 
         safe_close_pair(fd);
         return 1;


@@ -143,6 +143,11 @@ void pager_close(void) {
 
         /* Inform pager that we are done */
         fclose(stdout);
 
         /* 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;
         kill(pager_pid, SIGCONT);
         (void) wait_for_terminate(pager_pid, NULL);
         pager_pid = 0;