SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pager: port fallback pager to use copy_bytes()

Browse Source
This commit is contained in:
Lennart Poettering
2015-08-28 02:05:51 +02:00
parent 81d20007f9
commit 6a7c676c54
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/pager.c
+5 -7
View File
@@ -31,18 +31,16 @@
#include "macro.h"
#include "terminal-util.h"
#include "signal-util.h"
#include "copy.h"
static pid_t pager_pid = 0;
noreturn static void pager_fallback(void) {
ssize_t n;
int r;
do {
n = splice(STDIN_FILENO, NULL, STDOUT_FILENO, NULL, 64*1024, 0);
} while (n > 0);
if (n < 0) {
log_error_errno(errno, "Internal pager failed: %m");
r = copy_bytes(STDIN_FILENO, STDOUT_FILENO, (off_t) -1, false);
if (r < 0) {
log_error_errno(r, "Internal pager failed: %m");
_exit(EXIT_FAILURE);
}