===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-fn.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -c -r1.93 -r1.94
*** src/usr.bin/tmux/server-fn.c	2015/11/18 14:27:44	1.93
--- src/usr.bin/tmux/server-fn.c	2015/11/24 23:46:15	1.94
***************
*** 1,4 ****
! /* $OpenBSD: server-fn.c,v 1.93 2015/11/18 14:27:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-fn.c,v 1.94 2015/11/24 23:46:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 34,53 ****
  void
  server_fill_environ(struct session *s, struct environ *env)
  {
! 	char	var[PATH_MAX], *term;
! 	u_int	idx;
! 	long	pid;
  
  	if (s != NULL) {
  		term = options_get_string(global_options, "default-terminal");
! 		environ_set(env, "TERM", term);
  
  		idx = s->id;
  	} else
  		idx = (u_int)-1;
  	pid = getpid();
! 	xsnprintf(var, sizeof var, "%s,%ld,%u", socket_path, pid, idx);
! 	environ_set(env, "TMUX", var);
  }
  
  void
--- 34,52 ----
  void
  server_fill_environ(struct session *s, struct environ *env)
  {
! 	char	*term;
! 	u_int	 idx;
! 	long	 pid;
  
  	if (s != NULL) {
  		term = options_get_string(global_options, "default-terminal");
! 		environ_set(env, "TERM", "%s", term);
  
  		idx = s->id;
  	} else
  		idx = (u_int)-1;
  	pid = getpid();
! 	environ_set(env, "TMUX", "%s,%ld,%u", socket_path, pid, idx);
  }
  
  void