Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-07-14 22:01:10 +01:00
7 changed files with 18 additions and 8 deletions

12
proc.c
View File

@ -240,7 +240,7 @@ proc_set_signals(struct tmuxproc *tp, void (*signalcb)(int))
}
void
proc_clear_signals(struct tmuxproc *tp)
proc_clear_signals(struct tmuxproc *tp, int defaults)
{
struct sigaction sa;
@ -260,6 +260,16 @@ proc_clear_signals(struct tmuxproc *tp)
signal_del(&tp->ev_sigusr1);
signal_del(&tp->ev_sigusr2);
signal_del(&tp->ev_sigwinch);
if (defaults) {
sigaction(SIGHUP, &sa, NULL);
sigaction(SIGCHLD, &sa, NULL);
sigaction(SIGCONT, &sa, NULL);
sigaction(SIGTERM, &sa, NULL);
sigaction(SIGUSR1, &sa, NULL);
sigaction(SIGUSR2, &sa, NULL);
sigaction(SIGWINCH, &sa, NULL);
}
}
struct tmuxpeer *