circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:tmux/tmux

This commit is contained in:
Nicholas Marriott 2017-03-21 21:38:03 +00:00
parent 57cb6ef3a2 02ddd4ce70
commit 3cc2486106
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tmux.c
View File

@ -110,18 +110,17 @@ make_label(const char *label)
{ {
char *base, resolved[PATH_MAX], *path, *s; char *base, resolved[PATH_MAX], *path, *s;
struct stat sb; struct stat sb;
u_int uid; uid_t uid;
int saved_errno; int saved_errno;
if (label == NULL) if (label == NULL)
label = "default"; label = "default";
uid = getuid(); uid = getuid();
if ((s = getenv("TMUX_TMPDIR")) != NULL && *s != '\0') if ((s = getenv("TMUX_TMPDIR")) != NULL && *s != '\0')
xasprintf(&base, "%s/tmux-%u", s, uid); xasprintf(&base, "%s/tmux-%u", s, uid);
else else
xasprintf(&base, "%s/tmux-%u", _PATH_TMP, uid); xasprintf(&base, "%s/tmux-%ld", _PATH_TMP, (long)uid);
if (mkdir(base, S_IRWXU) != 0 && errno != EEXIST) if (mkdir(base, S_IRWXU) != 0 && errno != EEXIST)
goto fail; goto fail;