===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/client.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -c -r1.35 -r1.36
*** src/usr.bin/tmux/client.c	2009/12/03 22:50:09	1.35
--- src/usr.bin/tmux/client.c	2010/05/03 16:06:32	1.36
***************
*** 1,4 ****
! /* $OpenBSD: client.c,v 1.35 2009/12/03 22:50:09 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: client.c,v 1.36 2010/05/03 16:06:32 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 172,206 ****
  __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);
  
  	/*
  	 * imsg_read in the first client poll loop (before the terminal has
--- 172,183 ----
  __dead void
  client_main(void)
  {
  	logfile("client");
  
  	/* Note: event_init() has already been called. */
  
  	/* Set up signals. */
! 	set_signals(client_signal);
  
  	/*
  	 * imsg_read in the first client poll loop (before the terminal has