1 files changed, 5 insertions, 2 deletions
diff --git a/tmux.c b/tmux.c
index 3b40da12..0225f5f6 100644
--- a/tmux.c
+++ b/tmux.c
@@ -169,12 +169,15 @@ parseenvironment(void)
 char *
 makesocketpath(const char *label)
 {
-	char		base[MAXPATHLEN], *path;
+	char		base[MAXPATHLEN], *path, *s;
 	struct stat	sb;
 	u_int		uid;
 
 	uid = getuid();
-	xsnprintf(base, MAXPATHLEN, "%s/tmux-%d", _PATH_TMP, uid);
+	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);