X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpager.c;h=72a29f22855ea569a4bbdc8a713ec36a63da07ae;hb=0371ca0dac1d70b2e5060a3c4e6fbbc2bdbd8671;hp=488a12c763839f156471d1b56606fae5f06b8188;hpb=8481248b9fbddc6d5e6ff26eb23505ef13dc85f7;p=elogind.git diff --git a/src/shared/pager.c b/src/shared/pager.c index 488a12c76..72a29f228 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c @@ -32,19 +32,22 @@ static pid_t pager_pid = 0; -_noreturn_ static void pager_fallback(void) { +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; @@ -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)