chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c91b060
)
pager: port fallback pager to use copy_bytes()
author
Lennart Poettering
<lennart@poettering.net>
Thu, 27 Aug 2015 22:11:49 +0000
(
00:11
+0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Tue, 14 Mar 2017 09:19:06 +0000
(10:19 +0100)
src/shared/pager.c
patch
|
blob
|
history
diff --git
a/src/shared/pager.c
b/src/shared/pager.c
index b2635740f2ae4430887fc5a168e776394806c508..d6474030c444d312d366f8faef04c7100bfa44de 100644
(file)
--- a/
src/shared/pager.c
+++ b/
src/shared/pager.c
@@
-31,18
+31,16
@@
#include "macro.h"
#include "terminal-util.h"
#include "signal-util.h"
#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) {
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);
+ int r;
- 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);
}
_exit(EXIT_FAILURE);
}