Prep v221: Update and clean up build system to sync with upstream

[elogind.git] / src / shared / pager.c

diff --git a/src/shared/pager.c b/src/shared/pager.c
index b5a584ba0159f564147392d197a6870b1dc873cb..b2635740f2ae4430887fc5a168e776394806c508 100644 (file)
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -29,6 +29,8 @@
 #include "util.h"
 #include "process-util.h"
 #include "macro.h"
+#include "terminal-util.h"
+#include "signal-util.h"
 
 static pid_t pager_pid = 0;
 
@@ -84,6 +86,9 @@ int pager_open(bool jump_to_end) {
         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);
 
@@ -147,6 +152,8 @@ bool pager_have(void) {
         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;
@@ -177,6 +184,10 @@ int show_man_page(const char *desc, bool null_stdio) {
 
         if (pid == 0) {
                 /* Child */
+
+                (void) reset_all_signal_handlers();
+                (void) reset_signal_mask();
+
                 if (null_stdio) {
                         r = make_null_stdio();
                         if (r < 0) {
@@ -197,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;
 }
+#endif // 0