chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pager: port fallback pager to use copy_bytes()
[elogind.git]
/
src
/
shared
/
pager.c
diff --git
a/src/shared/pager.c
b/src/shared/pager.c
index aa74bab103de3406aafb3c0bc9e3a02238d9dbc3..d6474030c444d312d366f8faef04c7100bfa44de 100644
(file)
--- a/
src/shared/pager.c
+++ b/
src/shared/pager.c
@@
-19,7
+19,6
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sys/types.h>
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
@@
-28,19
+27,20
@@
#include "pager.h"
#include "util.h"
#include "pager.h"
#include "util.h"
+#include "process-util.h"
#include "macro.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("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);
}
@@
-67,17
+67,15
@@
int pager_open(bool jump_to_end) {
* pager so that we get the value from the actual tty */
columns();
* pager so that we get the value from the actual tty */
columns();
- if (pipe(fd) < 0) {
- log_error("Failed to create pager pipe: %m");
- return -errno;
- }
+ if (pipe(fd) < 0)
+ return log_error_errno(errno, "Failed to create pager pipe: %m");
parent_pid = getpid();
pager_pid = fork();
if (pager_pid < 0) {
r = -errno;
parent_pid = getpid();
pager_pid = fork();
if (pager_pid < 0) {
r = -errno;
- log_error
(
"Failed to fork pager: %m");
+ log_error
_errno(errno,
"Failed to fork pager: %m");
safe_close_pair(fd);
return r;
}
safe_close_pair(fd);
return r;
}
@@
-86,6
+84,9
@@
int pager_open(bool jump_to_end) {
if (pager_pid == 0) {
const char* less_opts;
if (pager_pid == 0) {
const char* less_opts;
+ (void) reset_all_signal_handlers();
+ (void) reset_signal_mask();
+
dup2(fd[0], STDIN_FILENO);
safe_close_pair(fd);
dup2(fd[0], STDIN_FILENO);
safe_close_pair(fd);
@@
-93,7
+94,7
@@
int pager_open(bool jump_to_end) {
if (!less_opts)
less_opts = "FRSXMK";
if (jump_to_end)
if (!less_opts)
less_opts = "FRSXMK";
if (jump_to_end)
- less_opts = str
append
a(less_opts, " +G");
+ less_opts = str
join
a(less_opts, " +G");
setenv("LESS", less_opts, 1);
/* Make sure the pager goes away when the parent dies */
setenv("LESS", less_opts, 1);
/* Make sure the pager goes away when the parent dies */
@@
-126,10
+127,8
@@
int pager_open(bool jump_to_end) {
}
/* Return in the parent */
}
/* Return in the parent */
- if (dup2(fd[1], STDOUT_FILENO) < 0) {
- log_error("Failed to duplicate pager pipe: %m");
- return -errno;
- }
+ if (dup2(fd[1], STDOUT_FILENO) < 0)
+ return log_error_errno(errno, "Failed to duplicate pager pipe: %m");
safe_close_pair(fd);
return 1;
safe_close_pair(fd);
return 1;
@@
-151,6
+150,8
@@
bool pager_have(void) {
return pager_pid > 0;
}
return pager_pid > 0;
}
+/// UNNEEDED by elogind
+#if 0
int show_man_page(const char *desc, bool null_stdio) {
const char *args[4] = { "man", NULL, NULL, NULL };
char *e = NULL;
int show_man_page(const char *desc, bool null_stdio) {
const char *args[4] = { "man", NULL, NULL, NULL };
char *e = NULL;
@@
-176,13
+177,15
@@
int show_man_page(const char *desc, bool null_stdio) {
args[1] = desc;
pid = fork();
args[1] = desc;
pid = fork();
- if (pid < 0) {
- log_error("Failed to fork: %m");
- return -errno;
- }
+ if (pid < 0)
+ return log_error_errno(errno, "Failed to fork: %m");
if (pid == 0) {
/* Child */
if (pid == 0) {
/* Child */
+
+ (void) reset_all_signal_handlers();
+ (void) reset_signal_mask();
+
if (null_stdio) {
r = make_null_stdio();
if (r < 0) {
if (null_stdio) {
r = make_null_stdio();
if (r < 0) {
@@
-192,7
+195,7
@@
int show_man_page(const char *desc, bool null_stdio) {
}
execvp(args[0], (char**) args);
}
execvp(args[0], (char**) args);
- log_error
(
"Failed to execute man: %m");
+ log_error
_errno(errno,
"Failed to execute man: %m");
_exit(EXIT_FAILURE);
}
_exit(EXIT_FAILURE);
}
@@
-203,3
+206,4
@@
int show_man_page(const char *desc, bool null_stdio) {
log_debug("Exit code %i status %i", status.si_code, status.si_status);
return status.si_status;
}
log_debug("Exit code %i status %i", status.si_code, status.si_status);
return status.si_status;
}
+#endif // 0