===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/client.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/usr.bin/tmux/client.c	2009/11/26 21:37:13	1.34
--- src/usr.bin/tmux/client.c	2009/12/03 22:50:09	1.35
***************
*** 1,4 ****
! /* $OpenBSD: client.c,v 1.34 2009/11/26 21:37:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 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>
***************
*** 125,131 ****
  
  	if (getcwd(data.cwd, sizeof data.cwd) == NULL)
  		*data.cwd = '\0';
! 	
  	term = getenv("TERM");
  	if (term == NULL ||
  	    strlcpy(data.term, term, sizeof data.term) >= sizeof data.term)
--- 125,131 ----
  
  	if (getcwd(data.cwd, sizeof data.cwd) == NULL)
  		*data.cwd = '\0';
! 
  	term = getenv("TERM");
  	if (term == NULL ||
  	    strlcpy(data.term, term, sizeof data.term) >= sizeof data.term)
***************
*** 143,149 ****
  	struct msg_environ_data	data;
  	char		      **var;
  
!  	for (var = environ; *var != NULL; var++) {
  		if (strlcpy(data.var, *var, sizeof data.var) >= sizeof data.var)
  			continue;
  		client_write_server(MSG_ENVIRON, &data, sizeof data);
--- 143,149 ----
  	struct msg_environ_data	data;
  	char		      **var;
  
! 	for (var = environ; *var != NULL; var++) {
  		if (strlcpy(data.var, *var, sizeof data.var) >= sizeof data.var)
  			continue;
  		client_write_server(MSG_ENVIRON, &data, sizeof data);
***************
*** 153,159 ****
  void
  client_write_server(enum msgtype type, void *buf, size_t len)
  {
!  	imsg_compose(&client_ibuf, type, PROTOCOL_VERSION, -1, -1, buf, len);
  }
  
  void
--- 153,159 ----
  void
  client_write_server(enum msgtype type, void *buf, size_t len)
  {
! 	imsg_compose(&client_ibuf, type, PROTOCOL_VERSION, -1, -1, buf, len);
  }
  
  void
***************
*** 179,185 ****
  
  	/* Note: event_init() has already been called. */
  
!  	/* Set up signals. */
  	memset(&sigact, 0, sizeof sigact);
  	sigemptyset(&sigact.sa_mask);
  	sigact.sa_flags = SA_RESTART;
--- 179,185 ----
  
  	/* Note: event_init() has already been called. */
  
! 	/* Set up signals. */
  	memset(&sigact, 0, sizeof sigact);
  	sigemptyset(&sigact.sa_mask);
  	sigact.sa_flags = SA_RESTART;
***************
*** 263,271 ****
  		if (client_dispatch() != 0) {
  			event_loopexit(NULL);
  			return;
! 		}	
  	}
! 	
  	if (events & EV_WRITE) {
  		if (msgbuf_write(&client_ibuf.w) < 0)
  			goto lost_server;
--- 263,271 ----
  		if (client_dispatch() != 0) {
  			event_loopexit(NULL);
  			return;
! 		}
  	}
! 
  	if (events & EV_WRITE) {
  		if (msgbuf_write(&client_ibuf.w) < 0)
  			goto lost_server;
***************
*** 341,347 ****
  			if (datalen != sizeof lockdata)
  				fatalx("bad MSG_LOCK size");
  			memcpy(&lockdata, imsg.data, sizeof lockdata);
! 			
  			lockdata.cmd[(sizeof lockdata.cmd) - 1] = '\0';
  			system(lockdata.cmd);
  			client_write_server(MSG_UNLOCK, NULL, 0);
--- 341,347 ----
  			if (datalen != sizeof lockdata)
  				fatalx("bad MSG_LOCK size");
  			memcpy(&lockdata, imsg.data, sizeof lockdata);
! 
  			lockdata.cmd[(sizeof lockdata.cmd) - 1] = '\0';
  			system(lockdata.cmd);
  			client_write_server(MSG_UNLOCK, NULL, 0);