bus: make sd_bus_request_name() and sd_bus_release_name() behave more like other...

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

diff --git a/src/shared/pager.c b/src/shared/pager.c
index 6799787e85b0cf7d339e23d553b328b6fbd9d3ab..9fa611479cff0cc10b98c7d60ca0dbbfd3e3f00e 100644 (file)
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -34,17 +34,20 @@ 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);
+
         if (n < 0) {
                 log_error("Internal pager failed: %m");
                 _exit(EXIT_FAILURE);
         }
+
         _exit(EXIT_SUCCESS);
 }
 
-int pager_open(void) {
+int pager_open(bool jump_to_end) {
         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 (isatty(STDOUT_FILENO) <= 0)
+        if (!on_tty())
                 return 0;
 
         /* Determine and cache number of columns before we spawn the
@@ -85,7 +88,10 @@ int pager_open(void) {
                 dup2(fd[0], STDIN_FILENO);
                 close_pipe(fd);
 
-                setenv("LESS", "FRSX", 0);
+                if (jump_to_end)
+                        setenv("LESS", "FRSXMK+G", 1);
+                else
+                        setenv("LESS", "FRSXMK", 1);
 
                 /* Make sure the pager goes away when the parent dies */
                 if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)