circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-07 16:28:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-07-14 22:01:10 +01:00
commit acbbc93501
7 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client.c
View File

@ -366,7 +366,6 @@ client_main(struct event_base *base, int argc, char **argv, int flags)
if (client_exittype == MSG_EXEC) { if (client_exittype == MSG_EXEC) {
if (client_flags & CLIENT_CONTROLCONTROL) if (client_flags & CLIENT_CONTROLCONTROL)
tcsetattr(STDOUT_FILENO, TCSAFLUSH, &saved_tio); tcsetattr(STDOUT_FILENO, TCSAFLUSH, &saved_tio);
proc_clear_signals(client_proc);
client_exec(client_execshell, client_execcmd); client_exec(client_execshell, client_execcmd);
} }
@ -482,6 +481,8 @@ client_exec(const char *shell, const char *shellcmd)
xasprintf(&argv0, "%s", name); xasprintf(&argv0, "%s", name);
setenv("SHELL", shell, 1); setenv("SHELL", shell, 1);
proc_clear_signals(client_proc, 1);
setblocking(STDIN_FILENO, 1); setblocking(STDIN_FILENO, 1);
setblocking(STDOUT_FILENO, 1); setblocking(STDOUT_FILENO, 1);
setblocking(STDERR_FILENO, 1); setblocking(STDERR_FILENO, 1);
@ -629,7 +630,6 @@ client_dispatch_wait(struct imsg *imsg)
if (datalen == 0 || data[datalen - 1] != '\0') if (datalen == 0 || data[datalen - 1] != '\0')
fatalx("bad MSG_SHELL string"); fatalx("bad MSG_SHELL string");
proc_clear_signals(client_proc);
client_exec(data, shell_command); client_exec(data, shell_command);
/* NOTREACHED */ /* NOTREACHED */
case MSG_DETACH: case MSG_DETACH:

2
cmd-pipe-pane.c
View File

@ -114,7 +114,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
case 0: case 0:
/* Child process. */ /* Child process. */
proc_clear_signals(server_proc); proc_clear_signals(server_proc, 1);
sigprocmask(SIG_SETMASK, &oldset, NULL); sigprocmask(SIG_SETMASK, &oldset, NULL);
close(pipe_fd[0]); close(pipe_fd[0]);

2
job.c
View File

@ -71,7 +71,7 @@ job_run(const char *cmd, struct session *s, const char *cwd,
close(out[1]); close(out[1]);
return (NULL); return (NULL);
case 0: case 0:
proc_clear_signals(server_proc); proc_clear_signals(server_proc, 1);
sigprocmask(SIG_SETMASK, &oldset, NULL); sigprocmask(SIG_SETMASK, &oldset, NULL);
if (cwd == NULL || chdir(cwd) != 0) { if (cwd == NULL || chdir(cwd) != 0) {

12
proc.c
View File

@ -240,7 +240,7 @@ proc_set_signals(struct tmuxproc *tp, void (*signalcb)(int))
} }
void void
proc_clear_signals(struct tmuxproc *tp) proc_clear_signals(struct tmuxproc *tp, int defaults)
{ {
struct sigaction sa; struct sigaction sa;
@ -260,6 +260,16 @@ proc_clear_signals(struct tmuxproc *tp)
signal_del(&tp->ev_sigusr1); signal_del(&tp->ev_sigusr1);
signal_del(&tp->ev_sigusr2); signal_del(&tp->ev_sigusr2);
signal_del(&tp->ev_sigwinch); 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 * struct tmuxpeer *

2
server.c
View File

@ -160,7 +160,7 @@ server_start(struct tmuxproc *client, struct event_base *base, int lockfd,
close(pair[0]); close(pair[0]);
if (daemon(1, 0) != 0) if (daemon(1, 0) != 0)
fatal("daemon failed"); fatal("daemon failed");
proc_clear_signals(client); proc_clear_signals(client, 0);
if (event_reinit(base) != 0) if (event_reinit(base) != 0)
fatalx("event_reinit failed"); fatalx("event_reinit failed");
server_proc = proc_start("server"); server_proc = proc_start("server");

2
tmux.h
View File

@ -1503,7 +1503,7 @@ struct tmuxproc *proc_start(const char *);
void proc_loop(struct tmuxproc *, int (*)(void)); void proc_loop(struct tmuxproc *, int (*)(void));
void proc_exit(struct tmuxproc *); void proc_exit(struct tmuxproc *);
void proc_set_signals(struct tmuxproc *, void(*)(int)); void proc_set_signals(struct tmuxproc *, void(*)(int));
void proc_clear_signals(struct tmuxproc *); void proc_clear_signals(struct tmuxproc *, int);
struct tmuxpeer *proc_add_peer(struct tmuxproc *, int, struct tmuxpeer *proc_add_peer(struct tmuxproc *, int,
void (*)(struct imsg *, void *), void *); void (*)(struct imsg *, void *), void *);
void proc_remove_peer(struct tmuxpeer *); void proc_remove_peer(struct tmuxpeer *);

2
window.c
View File

@ -933,7 +933,7 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv,
sigprocmask(SIG_SETMASK, &oldset, NULL); sigprocmask(SIG_SETMASK, &oldset, NULL);
return (-1); return (-1);
case 0: case 0:
proc_clear_signals(server_proc); proc_clear_signals(server_proc, 1);
sigprocmask(SIG_SETMASK, &oldset, NULL); sigprocmask(SIG_SETMASK, &oldset, NULL);
if (chdir(wp->cwd) != 0) { if (chdir(wp->cwd) != 0) {