chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
everywhere: port everything to sigprocmask_many() and friends
[elogind.git]
/
src
/
shared
/
pager.c
diff --git
a/src/shared/pager.c
b/src/shared/pager.c
index 8635d9a600dd15ac345e2cdd1c033b10610c4ea9..13f03e798b2b83ec030941d1918ac3ab02e25a38 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,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;
@@
-84,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);
@@
-177,6
+182,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) {