diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-03-21 21:38:03 +0000 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-03-21 21:38:03 +0000 |
commit | 3cc24861060b02637a0522176cc185c1c967aec3 (patch) | |
tree | 3070ba33002780c7be8831863469dd9484314b06 /tmux.c | |
parent | 57cb6ef3a22369174a758b37dcb35893e29a6826 (diff) | |
parent | 02ddd4ce70eb893f109b918c624a9697f894e829 (diff) | |
download | rtmux-3cc24861060b02637a0522176cc185c1c967aec3.tar.gz rtmux-3cc24861060b02637a0522176cc185c1c967aec3.tar.bz2 rtmux-3cc24861060b02637a0522176cc185c1c967aec3.zip |
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'tmux.c')
-rw-r--r-- | tmux.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -110,18 +110,17 @@ make_label(const char *label) { char *base, resolved[PATH_MAX], *path, *s; struct stat sb; - u_int uid; + uid_t uid; int saved_errno; if (label == NULL) label = "default"; - uid = getuid(); if ((s = getenv("TMUX_TMPDIR")) != NULL && *s != '\0') xasprintf(&base, "%s/tmux-%u", s, uid); 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) goto fail; |