===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -c -r1.99 -r1.100
*** src/usr.bin/tmux/server.c	2011/01/01 01:12:09	1.99
--- src/usr.bin/tmux/server.c	2011/01/08 01:52:36	1.100
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.99 2011/01/01 01:12:09 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.100 2011/01/08 01:52:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 74,80 ****
  	struct sockaddr_un	sa;
  	size_t			size;
  	mode_t			mask;
! 	int			fd, mode;
  
  	memset(&sa, 0, sizeof sa);
  	sa.sun_family = AF_UNIX;
--- 74,80 ----
  	struct sockaddr_un	sa;
  	size_t			size;
  	mode_t			mask;
! 	int			fd;
  
  	memset(&sa, 0, sizeof sa);
  	sa.sun_family = AF_UNIX;
***************
*** 95,105 ****
  
  	if (listen(fd, 16) == -1)
  		fatal("listen failed");
! 
! 	if ((mode = fcntl(fd, F_GETFL)) == -1)
! 		fatal("fcntl failed");
! 	if (fcntl(fd, F_SETFL, mode|O_NONBLOCK) == -1)
! 		fatal("fcntl failed");
  
  	server_update_socket();
  
--- 95,101 ----
  
  	if (listen(fd, 16) == -1)
  		fatal("listen failed");
! 	setblocking(fd, 0);
  
  	server_update_socket();