aboutsummaryrefslogtreecommitdiff
path: root/tmux.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2010-08-29 14:42:11 +0000
committerTiago Cunha <tcunha@gmx.com>2010-08-29 14:42:11 +0000
commit56040be3468e655256362c7d5b230b15236b9dd2 (patch)
treeac7667f2e41cc6d09c01dc58d084e715e3f3dd77 /tmux.c
parente6bb3d69422d948373b10074b043a8ef0189b1de (diff)
downloadrtmux-56040be3468e655256362c7d5b230b15236b9dd2.tar.gz
rtmux-56040be3468e655256362c7d5b230b15236b9dd2.tar.bz2
rtmux-56040be3468e655256362c7d5b230b15236b9dd2.zip
Sync OpenBSD patchset 751:
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.
Diffstat (limited to 'tmux.c')
-rw-r--r--tmux.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tmux.c b/tmux.c
index b2a6d1b8..412e913e 100644
--- a/tmux.c
+++ b/tmux.c
@@ -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: