X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fpager.c;h=9fa611479cff0cc10b98c7d60ca0dbbfd3e3f00e;hp=e9aa022a73fe3718f5ebf53935a5a80bf1d88a42;hb=46e65dcc3a522b5e992e165b5e61d14254026859;hpb=a4c41bf3fa905c38e6e4d159c13eed890d53838b diff --git a/src/shared/pager.c b/src/shared/pager.c index e9aa022a7..9fa611479 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c @@ -34,13 +34,16 @@ 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); } @@ -86,9 +89,9 @@ int pager_open(bool jump_to_end) { close_pipe(fd); if (jump_to_end) - setenv("LESS", "FRSXK+G", 1); + setenv("LESS", "FRSXMK+G", 1); else - setenv("LESS", "FRSXK", 1); + setenv("LESS", "FRSXMK", 1); /* Make sure the pager goes away when the parent dies */ if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)