chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v225: Remove some orphaned files
[elogind.git]
/
src
/
shared
/
pager.c
diff --git
a/src/shared/pager.c
b/src/shared/pager.c
index f12bfb3287f0cdca2a762b41d22ceb0a18444037..b2635740f2ae4430887fc5a168e776394806c508 100644
(file)
--- a/
src/shared/pager.c
+++ b/
src/shared/pager.c
@@
-27,7
+27,10
@@
#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"
static pid_t pager_pid = 0;
static pid_t pager_pid = 0;
@@
-83,6
+86,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);
@@
-146,6
+152,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,6
+184,10
@@
int show_man_page(const char *desc, bool null_stdio) {
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) {
@@
-196,3
+208,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