X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fpager.c;h=5165d2b1c854f101285e8e58fef06d297a66f988;hp=3fc81820e9b4de7444658197cb98bb7ee3858c9d;hb=82910f1358c1d15f4e432e6d1f42efdeaf1eddb1;hpb=9f36aa6846d795c39d453726b868dfb6e3c5b78d;ds=sidebyside

diff --git a/src/shared/pager.c b/src/shared/pager.c
index 3fc81820e..5165d2b1c 100644
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -6,16 +6,16 @@
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
@@ -44,20 +44,21 @@ _noreturn_ static void pager_fallback(void) {
         _exit(EXIT_SUCCESS);
 }
 
-void pager_open(void) {
+int pager_open(void) {
         int fd[2];
         const char *pager;
         pid_t parent_pid;
+        int r;
 
         if (pager_pid > 0)
-                return;
+                return 1;
 
         if ((pager = getenv("SYSTEMD_PAGER")) || (pager = getenv("PAGER")))
                 if (!*pager || streq(pager, "cat"))
-                        return;
+                        return 0;
 
-        if (isatty(STDOUT_FILENO) <= 0)
-                return;
+        if (!on_tty())
+                return 0;
 
         /* Determine and cache number of columns before we spawn the
          * pager so that we get the value from the actual tty */
@@ -65,16 +66,17 @@ void pager_open(void) {
 
         if (pipe(fd) < 0) {
                 log_error("Failed to create pager pipe: %m");
-                return;
+                return -errno;
         }
 
         parent_pid = getpid();
 
         pager_pid = fork();
         if (pager_pid < 0) {
+                r = -errno;
                 log_error("Failed to fork pager: %m");
                 close_pipe(fd);
-                return;
+                return r;
         }
 
         /* In the child start the pager */
@@ -83,7 +85,7 @@ void pager_open(void) {
                 dup2(fd[0], STDIN_FILENO);
                 close_pipe(fd);
 
-                setenv("LESS", "FRSX", 0);
+                setenv("LESS", "FRSXK", 0);
 
                 /* Make sure the pager goes away when the parent dies */
                 if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)
@@ -115,10 +117,13 @@ void pager_open(void) {
         }
 
         /* Return in the parent */
-        if (dup2(fd[1], STDOUT_FILENO) < 0)
+        if (dup2(fd[1], STDOUT_FILENO) < 0) {
                 log_error("Failed to duplicate pager pipe: %m");
+                return -errno;
+        }
 
         close_pipe(fd);
+        return 1;
 }
 
 void pager_close(void) {
@@ -132,3 +137,7 @@ void pager_close(void) {
         wait_for_terminate(pager_pid, NULL);
         pager_pid = 0;
 }
+
+bool pager_have(void) {
+        return pager_pid > 0;
+}