chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sleep-config: fix useless check for swapfile type
[elogind.git]
/
src
/
shared
/
pager.c
diff --git
a/src/shared/pager.c
b/src/shared/pager.c
index 4ffb530e934810b41f3455e1ea18bae8a6054196..72a29f22855ea569a4bbdc8a713ec36a63da07ae 100644
(file)
--- a/
src/shared/pager.c
+++ b/
src/shared/pager.c
@@
-32,15
+32,18
@@
static pid_t pager_pid = 0;
static pid_t pager_pid = 0;
-
_noreturn_
static void pager_fallback(void) {
+
noreturn
static void pager_fallback(void) {
ssize_t n;
ssize_t n;
+
do {
n = splice(STDIN_FILENO, NULL, STDOUT_FILENO, NULL, 64*1024, 0);
} while (n > 0);
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);
}
if (n < 0) {
log_error("Internal pager failed: %m");
_exit(EXIT_FAILURE);
}
+
_exit(EXIT_SUCCESS);
}
_exit(EXIT_SUCCESS);
}
@@
-86,9
+89,9
@@
int pager_open(bool jump_to_end) {
close_pipe(fd);
if (jump_to_end)
close_pipe(fd);
if (jump_to_end)
- setenv("LESS", "FRSX
K+G", 0
);
+ setenv("LESS", "FRSX
MK+G", 1
);
else
else
- setenv("LESS", "FRSX
K", 0
);
+ setenv("LESS", "FRSX
MK", 1
);
/* Make sure the pager goes away when the parent dies */
if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)
/* Make sure the pager goes away when the parent dies */
if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)