Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

1 files changed, 10 insertions, 10 deletions

diff --git a/tmux.c b/tmux.c
index 8ea91ebe..606c574f 100644
--- a/tmux.c
+++ b/tmux.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <event.h>
 #include <fcntl.h>
+#include <locale.h>
 #include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -167,10 +168,12 @@ makesocketpath(const char *label)
 	u_int		uid;
 
 	uid = getuid();
-	if ((s = getenv("TMPDIR")) == NULL || *s == '\0')
-		xsnprintf(base, sizeof base, "%s/tmux-%u", _PATH_TMP, uid);
-	else
+	if ((s = getenv("TMUX_TMPDIR")) != NULL && *s != '\0')
+		xsnprintf(base, sizeof base, "%s/", s);
+	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);
 
 	if (mkdir(base, S_IRWXU) != 0 && errno != EEXIST)
 		return (NULL);
@@ -244,18 +247,15 @@ main(int argc, char **argv)
 	malloc_options = (char *) "AFGJPX";
 #endif
 
+	setlocale(LC_TIME, "");
+
 	quiet = flags = 0;
 	label = path = NULL;
 	login_shell = (**argv == '-');
-	while ((opt = getopt(argc, argv, "28c:Cdf:lL:qS:uUvV")) != -1) {
+	while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:uUVv")) != -1) {
 		switch (opt) {
 		case '2':
 			flags |= IDENTIFY_256COLOURS;
-			flags &= ~IDENTIFY_88COLOURS;
-			break;
-		case '8':
-			flags |= IDENTIFY_88COLOURS;
-			flags &= ~IDENTIFY_256COLOURS;
 			break;
 		case 'c':
 			free(shell_cmd);
@@ -363,7 +363,7 @@ main(int argc, char **argv)
 			if (pw != NULL)
 				home = pw->pw_dir;
 		}
-		xasprintf(&cfg_file, "%s/%s", home, DEFAULT_CFG);
+		xasprintf(&cfg_file, "%s/.tmux.conf", home);
 		if (access(cfg_file, R_OK) != 0 && errno == ENOENT) {
 			free(cfg_file);
 			cfg_file = NULL;