From 57eb948c480da7bb7b54680786521e41baecb2fe Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Fri, 21 Jan 2011 23:46:50 +0000 Subject: Sync OpenBSD patchset 838: Use TMPDIR if set, from Han Boetes. --- tmux.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tmux.c') diff --git a/tmux.c b/tmux.c index 83b213d2..5a2fb01b 100644 --- a/tmux.c +++ b/tmux.c @@ -1,4 +1,4 @@ -/* $Id: tmux.c,v 1.234 2011-01-21 23:44:13 tcunha Exp $ */ +/* $Id: tmux.c,v 1.235 2011-01-21 23:46:50 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -172,12 +172,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); -- cgit