summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/tmux.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2010-08-19 18:29:01 +0000
committernicm <nicm@openbsd.org>2010-08-19 18:29:01 +0000
commitfb3b777613d8da026845b7c1b672c01e5037ad3a (patch)
treeae16e28cfc887e77ececaa14e0c55f8d24068dd7 /usr.bin/tmux/tmux.c
parentIntroduce an MI kern.consdev sysctl that will replace the MD (diff)
downloadwireguard-openbsd-fb3b777613d8da026845b7c1b672c01e5037ad3a.tar.xz
wireguard-openbsd-fb3b777613d8da026845b7c1b672c01e5037ad3a.zip
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 'usr.bin/tmux/tmux.c')
-rw-r--r--usr.bin/tmux/tmux.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index 76107b377ef..3493b2bd35c 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.86 2010/08/04 19:46:13 deraadt Exp $ */
+/* $OpenBSD: tmux.c,v 1.87 2010/08/19 18:29:01 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -549,7 +549,7 @@ main(int argc, char **argv)
event_dispatch();
- clear_signals();
+ clear_signals(0);
client_main(); /* doesn't return */
}
@@ -636,7 +636,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: