===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -c -r1.101 -r1.102
*** src/usr.bin/tmux/tmux.c	2011/01/08 01:52:37	1.101
--- src/usr.bin/tmux/tmux.c	2011/01/12 22:23:58	1.102
***************
*** 1,4 ****
! /* $OpenBSD: tmux.c,v 1.101 2011/01/08 01:52:37 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.c,v 1.102 2011/01/12 22:23:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 169,180 ****
  char *
  makesocketpath(const char *label)
  {
! 	char		base[MAXPATHLEN], *path;
  	struct stat	sb;
  	u_int		uid;
  
  	uid = getuid();
! 	xsnprintf(base, MAXPATHLEN, "%s/tmux-%d", _PATH_TMP, uid);
  
  	if (mkdir(base, S_IRWXU) != 0 && errno != EEXIST)
  		return (NULL);
--- 169,183 ----
  char *
  makesocketpath(const char *label)
  {
! 	char		base[MAXPATHLEN], *path, *s;
  	struct stat	sb;
  	u_int		uid;
  
  	uid = getuid();
! 	if ((s = getenv("TMPDIR")) == NULL || *s == '\0')
! 		xsnprintf(base, sizeof base, "%s/tmux-%u", _PATH_TMP, uid);
! 	else
! 		xsnprintf(base, sizeof base, "%s/tmux-%u", s, uid);
  
  	if (mkdir(base, S_IRWXU) != 0 && errno != EEXIST)
  		return (NULL);