===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -c -r1.163 -r1.164
*** src/usr.bin/tmux/server-client.c	2015/10/27 15:58:42	1.163
--- src/usr.bin/tmux/server-client.c	2015/10/28 09:51:55	1.164
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.163 2015/10/27 15:58:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.164 2015/10/28 09:51:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 59,65 ****
  	if (c->tty.path == NULL)
  		return (0);
  
! 	envent = environ_find(&c->environ, "TMUX");
  	if (envent == NULL || *envent->value == '\0')
  		return (0);
  
--- 59,65 ----
  	if (c->tty.path == NULL)
  		return (0);
  
! 	envent = environ_find(c->environ, "TMUX");
  	if (envent == NULL || *envent->value == '\0')
  		return (0);
  
***************
*** 95,101 ****
  		fatal("gettimeofday failed");
  	memcpy(&c->activity_time, &c->creation_time, sizeof c->activity_time);
  
! 	environ_init(&c->environ);
  
  	c->fd = -1;
  	c->cwd = -1;
--- 95,101 ----
  		fatal("gettimeofday failed");
  	memcpy(&c->activity_time, &c->creation_time, sizeof c->activity_time);
  
! 	c->environ = environ_create();
  
  	c->fd = -1;
  	c->cwd = -1;
***************
*** 219,225 ****
  	cmdq_free(c->cmdq);
  	c->cmdq = NULL;
  
! 	environ_free(&c->environ);
  
  	proc_remove_peer(c->peer);
  	c->peer = NULL;
--- 219,225 ----
  	cmdq_free(c->cmdq);
  	c->cmdq = NULL;
  
! 	environ_free(c->environ);
  
  	proc_remove_peer(c->peer);
  	c->peer = NULL;
***************
*** 1146,1152 ****
  		if (datalen == 0 || data[datalen - 1] != '\0')
  			fatalx("bad MSG_IDENTIFY_ENVIRON string");
  		if (strchr(data, '=') != NULL)
! 			environ_put(&c->environ, data);
  		log_debug("client %p IDENTIFY_ENVIRON %s", c, data);
  		break;
  	case MSG_IDENTIFY_CLIENTPID:
--- 1146,1152 ----
  		if (datalen == 0 || data[datalen - 1] != '\0')
  			fatalx("bad MSG_IDENTIFY_ENVIRON string");
  		if (strchr(data, '=') != NULL)
! 			environ_put(c->environ, data);
  		log_debug("client %p IDENTIFY_ENVIRON %s", c, data);
  		break;
  	case MSG_IDENTIFY_CLIENTPID: