circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-03 16:46:18 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 751:

Browse Source 
Do not call event_del() for signals after fork(), just use sigaction()
directly instead - calling libevent functions after fork() w/o
event_reinit() is a bad idea, even if in this case it was harmless.
This commit is contained in:
Tiago Cunha
2010-08-29 14:42:11 +00:00
parent e6bb3d6942
commit 56040be346
7 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd-pipe-pane.c
View File

@@ -1,4 +1,4 @@
/* $Id: cmd-pipe-pane.c,v 1.13 2010-06-15 20:25:40 tcunha Exp $ */
/* $Id: cmd-pipe-pane.c,v 1.14 2010-08-29 14:42:11 tcunha Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -96,7 +96,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
case 0:
/* Child process. */
close(pipe_fd[0]);
clear_signals();
clear_signals(1);
if (dup2(pipe_fd[1], STDIN_FILENO) == -1)
_exit(1);

4
job.c
View File

@@ -1,4 +1,4 @@
/* $Id: job.c,v 1.17 2010-05-14 14:30:01 tcunha Exp $ */
/* $Id: job.c,v 1.18 2010-08-29 14:42:11 tcunha Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -148,7 +148,7 @@ job_run(struct job *job)
case -1:
return (-1);
case 0: /* child */
clear_signals();
clear_signals(1);
environ_push(&global_environ);

4
server.c
View File

@@ -1,4 +1,4 @@
/* $Id: server.c,v 1.242 2010-06-22 23:21:39 tcunha Exp $ */
/* $Id: server.c,v 1.243 2010-08-29 14:42:11 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -143,7 +143,7 @@ server_start(char *path)
/* event_init() was called in our parent, need to reinit. */
if (event_reinit(ev_base) != 0)
fatal("event_reinit failed");
clear_signals();
clear_signals(0);
logfile("server");
log_debug("server started, pid %ld", (long) getpid());

31
signal.c
View File

@@ -1,4 +1,4 @@
/* $Id: signal.c,v 1.2 2010-05-14 14:35:26 tcunha Exp $ */
/* $Id: signal.c,v 1.3 2010-08-29 14:42:11 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -62,7 +62,7 @@ set_signals(void(*handler)(int, short, unused void *))
}
void
clear_signals(void)
clear_signals(int after_fork)
{
struct sigaction sigact;
@@ -79,10 +79,25 @@ clear_signals(void)
if (sigaction(SIGTSTP, &sigact, NULL) != 0)
fatal("sigaction failed");
event_del(&ev_sighup);
event_del(&ev_sigchld);
event_del(&ev_sigcont);
event_del(&ev_sigterm);
event_del(&ev_sigusr1);
event_del(&ev_sigwinch);
if (after_fork) {
if (sigaction(SIGHUP, &sigact, NULL) != 0)
fatal("sigaction failed");
if (sigaction(SIGCHLD, &sigact, NULL) != 0)
fatal("sigaction failed");
if (sigaction(SIGCONT, &sigact, NULL) != 0)
fatal("sigaction failed");
if (sigaction(SIGTERM, &sigact, NULL) != 0)
fatal("sigaction failed");
if (sigaction(SIGUSR1, &sigact, NULL) != 0)
fatal("sigaction failed");
if (sigaction(SIGWINCH, &sigact, NULL) != 0)
fatal("sigaction failed");
} else {
event_del(&ev_sighup);
event_del(&ev_sigchld);
event_del(&ev_sigcont);
event_del(&ev_sigterm);
event_del(&ev_sigusr1);
event_del(&ev_sigwinch);
}
}

6
tmux.c
View File

@@ -1,4 +1,4 @@
/* $Id: tmux.c,v 1.214 2010-07-17 14:36:41 tcunha Exp $ */
/* $Id: tmux.c,v 1.215 2010-08-29 14:42:11 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -566,7 +566,7 @@ main(int argc, char **argv)
event_dispatch();
clear_signals();
clear_signals(0);
client_main(); /* doesn't return */
}
@@ -653,7 +653,7 @@ main_dispatch(const char *shellcmd)
memcpy(&shelldata, imsg.data, sizeof shelldata);
shelldata.shell[(sizeof shelldata.shell) - 1] = '\0';
clear_signals();
clear_signals(0);
shell_exec(shelldata.shell, shellcmd);
default:

6
tmux.h
View File

@@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.573 2010-08-11 22:16:03 tcunha Exp $ */
/* $Id: tmux.h,v 1.574 2010-08-29 14:42:11 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1951,8 +1951,8 @@ void queue_window_name(struct window *);
char *default_window_name(struct window *);
/* signal.c */
void set_signals(void(*handler)(int, short, unused void *));
void clear_signals(void);
void set_signals(void(*)(int, short, void *));
void clear_signals(int);
/* session.c */
extern struct sessions sessions;

4
window.c
View File

@@ -1,4 +1,4 @@
/* $Id: window.c,v 1.134 2010-07-17 14:38:13 tcunha Exp $ */
/* $Id: window.c,v 1.135 2010-08-29 14:42:11 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -572,7 +572,7 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
environ_push(env);
clear_signals();
clear_signals(1);
log_close();
if (*wp->cmd != '\0') {