util: replace close_pipe() with new safe_close_pair()

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

diff --git a/src/shared/pager.c b/src/shared/pager.c
index 6799787e85b0cf7d339e23d553b328b6fbd9d3ab..002e3aa37356c7b0f556dd635bcacade31c7d502 100644 (file)
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -32,19 +32,22 @@
 
 static pid_t pager_pid = 0;
 
 
 static pid_t pager_pid = 0;
 

-_noreturn_ static void pager_fallback(void) {
+noreturn static void pager_fallback(void) {

         ssize_t n;
         ssize_t n;

+

         do {
                 n = splice(STDIN_FILENO, NULL, STDOUT_FILENO, NULL, 64*1024, 0);
         } while (n > 0);
         do {
                 n = splice(STDIN_FILENO, NULL, STDOUT_FILENO, NULL, 64*1024, 0);
         } while (n > 0);

+

         if (n < 0) {
                 log_error("Internal pager failed: %m");
                 _exit(EXIT_FAILURE);
         }
         if (n < 0) {
                 log_error("Internal pager failed: %m");
                 _exit(EXIT_FAILURE);
         }

+

         _exit(EXIT_SUCCESS);
 }
 
         _exit(EXIT_SUCCESS);
 }
 

-int pager_open(void) {
+int pager_open(bool jump_to_end) {

         int fd[2];
         const char *pager;
         pid_t parent_pid;
         int fd[2];
         const char *pager;
         pid_t parent_pid;


@@ -57,7 +60,7 @@ int pager_open(void) {
                 if (!*pager || streq(pager, "cat"))
                         return 0;
 
                 if (!*pager || streq(pager, "cat"))
                         return 0;
 

-        if (isatty(STDOUT_FILENO) <= 0)
+        if (!on_tty())

                 return 0;
 
         /* Determine and cache number of columns before we spawn the
                 return 0;
 
         /* Determine and cache number of columns before we spawn the


@@ -75,17 +78,23 @@ int pager_open(void) {
         if (pager_pid < 0) {
                 r = -errno;
                 log_error("Failed to fork pager: %m");
         if (pager_pid < 0) {
                 r = -errno;
                 log_error("Failed to fork pager: %m");

-                close_pipe(fd);
+                safe_close_pair(fd);

                 return r;
         }
 
         /* In the child start the pager */
         if (pager_pid == 0) {
                 return r;
         }
 
         /* In the child start the pager */
         if (pager_pid == 0) {

+                const char* less_opts;

 
                 dup2(fd[0], STDIN_FILENO);
 
                 dup2(fd[0], STDIN_FILENO);

-                close_pipe(fd);
+                safe_close_pair(fd);

 
 

-                setenv("LESS", "FRSX", 0);
+                less_opts = getenv("SYSTEMD_LESS");
+                if (!less_opts)
+                        less_opts = "FRSXMK";
+                if (jump_to_end)
+                        less_opts = strappenda(less_opts, " +G");
+                setenv("LESS", less_opts, 1);

 
                 /* Make sure the pager goes away when the parent dies */
                 if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)
 
                 /* Make sure the pager goes away when the parent dies */
                 if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)


@@ -122,7 +131,7 @@ int pager_open(void) {
                 return -errno;
         }
 
                 return -errno;
         }
 

-        close_pipe(fd);
+        safe_close_pair(fd);

         return 1;
 }
 
         return 1;
 }