===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -c -r1.148 -r1.149
*** src/usr.bin/tmux/tmux.c	2015/10/27 15:58:42	1.148
--- src/usr.bin/tmux/tmux.c	2015/10/28 09:51:55	1.149
***************
*** 1,4 ****
! /* $OpenBSD: tmux.c,v 1.148 2015/10/27 15:58:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.c,v 1.149 2015/10/28 09:51:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 41,47 ****
  struct options	*global_options;	/* server options */
  struct options	*global_s_options;	/* session options */
  struct options	*global_w_options;	/* window options */
! struct environ	 global_environ;
  
  char		*shell_cmd;
  int		 debug_level;
--- 41,47 ----
  struct options	*global_options;	/* server options */
  struct options	*global_s_options;	/* session options */
  struct options	*global_w_options;	/* window options */
! struct environ	*global_environ;
  
  char		*shell_cmd;
  int		 debug_level;
***************
*** 275,285 ****
  			flags |= CLIENT_UTF8;
  	}
  
! 	environ_init(&global_environ);
  	for (var = environ; *var != NULL; var++)
! 		environ_put(&global_environ, *var);
  	if (getcwd(tmp, sizeof tmp) != NULL)
! 		environ_set(&global_environ, "PWD", tmp);
  
  	global_options = options_create(NULL);
  	options_table_populate_tree(server_options_table, global_options);
--- 275,285 ----
  			flags |= CLIENT_UTF8;
  	}
  
! 	global_environ = environ_create();
  	for (var = environ; *var != NULL; var++)
! 		environ_put(global_environ, *var);
  	if (getcwd(tmp, sizeof tmp) != NULL)
! 		environ_set(global_environ, "PWD", tmp);
  
  	global_options = options_create(NULL);
  	options_table_populate_tree(server_options_table, global_options);