diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2020-05-10 16:52:46 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2020-05-10 16:52:46 +0100 |
| commit | d01e7aac89fefff31e668ac2d668c84c345b9e67 (patch) | |
| tree | 5d773b1d95cb96f9c3b70e1d34c355f283a0a136 /proc.c | |
| parent | 5fa377d9273ee609784acc538a5defa09feb3095 (diff) | |
| download | rtmux-d01e7aac89fefff31e668ac2d668c84c345b9e67.tar.gz rtmux-d01e7aac89fefff31e668ac2d668c84c345b9e67.tar.bz2 rtmux-d01e7aac89fefff31e668ac2d668c84c345b9e67.zip | |
Add a -D flag to ask tmux not to daemonize, useful both for running a debugger
(lldb does not have follow-fork-mode) and for running with a managed supervisor
init system. GitHub issue 2190.
Diffstat (limited to 'proc.c')
| -rw-r--r-- | proc.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -35,6 +35,7 @@ struct tmuxproc { void (*signalcb)(int); + struct event ev_sigint; struct event ev_sighup; struct event ev_sigchld; struct event ev_sigcont; @@ -219,10 +220,13 @@ proc_set_signals(struct tmuxproc *tp, void (*signalcb)(int)) sa.sa_flags = SA_RESTART; sa.sa_handler = SIG_IGN; - sigaction(SIGINT, &sa, NULL); sigaction(SIGPIPE, &sa, NULL); sigaction(SIGTSTP, &sa, NULL); + sigaction(SIGTTIN, &sa, NULL); + sigaction(SIGTTOU, &sa, NULL); + signal_set(&tp->ev_sigint, SIGINT, proc_signal_cb, tp); + signal_add(&tp->ev_sigint, NULL); signal_set(&tp->ev_sighup, SIGHUP, proc_signal_cb, tp); signal_add(&tp->ev_sighup, NULL); signal_set(&tp->ev_sigchld, SIGCHLD, proc_signal_cb, tp); @@ -249,10 +253,10 @@ proc_clear_signals(struct tmuxproc *tp, int defaults) sa.sa_flags = SA_RESTART; sa.sa_handler = SIG_DFL; - sigaction(SIGINT, &sa, NULL); sigaction(SIGPIPE, &sa, NULL); sigaction(SIGTSTP, &sa, NULL); + signal_del(&tp->ev_sigint); signal_del(&tp->ev_sighup); signal_del(&tp->ev_sigchld); signal_del(&tp->ev_sigcont); @@ -262,6 +266,7 @@ proc_clear_signals(struct tmuxproc *tp, int defaults) signal_del(&tp->ev_sigwinch); if (defaults) { + sigaction(SIGINT, &sa, NULL); sigaction(SIGHUP, &sa, NULL); sigaction(SIGCHLD, &sa, NULL); sigaction(SIGCONT, &sa, NULL); |