diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-10-25 07:48:17 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-10-25 07:48:17 +0000 |
| commit | 54fddf95d633cdd8a76cd6652442475851893c89 (patch) | |
| tree | 38799d6f855cd014be0ffbcc948701c5886cb3ad /usr.bin | |
| parent | 563a9298f23de9bafa71b290dcc2d39dba1d68d7 (diff) | |
Let's see if anyone screams about not being able to specify $TMPDIR
for their tmux sockets.
(Over the years, I have seen $TMPDIR set up worse than /tmp many times,
and don't know how this practice infected other parts of the system.
Nothing uses tmpdir(3), nor a huge-temporary-file program like sort.)
ok nicm
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/tmux.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index 11fde3a0a91..702052a8ba4 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.145 2015/10/23 16:07:29 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.146 2015/10/25 07:48:16 deraadt Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -128,8 +128,6 @@ makesocketpath(const char *label) uid = getuid(); if ((s = getenv("TMUX_TMPDIR")) != NULL && *s != '\0') xsnprintf(base, sizeof base, "%s/tmux-%u", s, uid); - else if ((s = getenv("TMPDIR")) != NULL && *s != '\0') - xsnprintf(base, sizeof base, "%s/tmux-%u", s, uid); else xsnprintf(base, sizeof base, "%s/tmux-%u", _PATH_TMP, uid); |