X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpager.c;h=72a29f22855ea569a4bbdc8a713ec36a63da07ae;hb=bf5332d2bf2a1acbba9daacf40570a4addbd3411;hp=5165d2b1c854f101285e8e58fef06d297a66f988;hpb=82910f1358c1d15f4e432e6d1f42efdeaf1eddb1;p=elogind.git diff --git a/src/shared/pager.c b/src/shared/pager.c index 5165d2b1c..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", "FRSXK", 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)