diff options
| author |   nicm <nicm@openbsd.org> | 2010-05-04 17:28:16 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-05-04 17:28:16 +0000 |
| commit | 4291359c3edfd0ba32fe6bb1fab7bcbc17be14c9 (patch) | |
| tree | 0dac866e51c37df6dbc4dfcc76ee88ceb8b9f79e /usr.bin/tmux/client.c | |
| parent | Assuming that a prefixlen 32 is a host route is not clever when IPv6 comes (diff) | |
| download | wireguard-openbsd-4291359c3edfd0ba32fe6bb1fab7bcbc17be14c9.tar.xz wireguard-openbsd-4291359c3edfd0ba32fe6bb1fab7bcbc17be14c9.zip | |
Put this back in with the initialisation in the right order.
Diffstat (limited to 'usr.bin/tmux/client.c')
| -rw-r--r-- | usr.bin/tmux/client.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/usr.bin/tmux/client.c b/usr.bin/tmux/client.c index 97c9f9bb06d..6586aab637e 100644 --- a/usr.bin/tmux/client.c +++ b/usr.bin/tmux/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.37 2010/05/04 08:48:06 nicm Exp $ */ +/* $OpenBSD: client.c,v 1.38 2010/05/04 17:28:16 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -172,35 +172,12 @@ client_update_event(void) __dead void client_main(void) { - struct event ev_sigcont, ev_sigterm, ev_sigwinch; - struct sigaction sigact; - logfile("client"); /* Note: event_init() has already been called. */ /* Set up signals. */ - memset(&sigact, 0, sizeof sigact); - sigemptyset(&sigact.sa_mask); - sigact.sa_flags = SA_RESTART; - sigact.sa_handler = SIG_IGN; - if (sigaction(SIGINT, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGPIPE, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGUSR1, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGUSR2, &sigact, NULL) != 0) - fatal("sigaction failed"); - if (sigaction(SIGTSTP, &sigact, NULL) != 0) - fatal("sigaction failed"); - - signal_set(&ev_sigcont, SIGCONT, client_signal, NULL); - signal_add(&ev_sigcont, NULL); - signal_set(&ev_sigterm, SIGTERM, client_signal, NULL); - signal_add(&ev_sigterm, NULL); - signal_set(&ev_sigwinch, SIGWINCH, client_signal, NULL); - signal_add(&ev_sigwinch, NULL); + set_signals(client_signal); /* * imsg_read in the first client poll loop (before the terminal has |