1 files changed, 38 insertions, 19 deletions

diff --git a/tmux.c b/tmux.c
index 3c1feccc..32b04bd1 100644
--- a/tmux.c
+++ b/tmux.c
@@ -26,6 +26,7 @@
 #include <langinfo.h>
 #include <locale.h>
 #include <pwd.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -46,15 +47,15 @@ const char	*shell_command;
 static __dead void	 usage(void);
 static char		*make_label(const char *, char **);
 
+static int		 areshell(const char *);
 static const char	*getshell(void);
-static int		 checkshell(const char *);
 
 static __dead void
 usage(void)
 {
 	fprintf(stderr,
 	    "usage: %s [-2CluvV] [-c shell-command] [-f file] [-L socket-name]\n"
-	    "            [-S socket-path] [command [flags]]\n",
+	    "            [-S socket-path] [-T features] [command [flags]]\n",
 	    getprogname());
 	exit(1);
 }
@@ -76,7 +77,7 @@ getshell(void)
 	return (_PATH_BSHELL);
 }
 
-static int
+int
 checkshell(const char *shell)
 {
 	if (shell == NULL || *shell != '/')
@@ -88,7 +89,7 @@ checkshell(const char *shell)
 	return (1);
 }
 
-int
+static int
 areshell(const char *shell)
 {
 	const char	*progname, *ptr;
@@ -165,6 +166,19 @@ setblocking(int fd, int state)
 }
 
 const char *
+sig2name(int signo)
+{
+     static char	s[11];
+
+#ifdef HAVE_SYS_SIGNAME
+     if (signo > 0 && signo < NSIG)
+	     return (sys_signame[signo]);
+#endif
+     xsnprintf(s, sizeof s, "%d", signo);
+     return (s);
+}
+
+const char *
 find_cwd(void)
 {
 	char		 resolved1[PATH_MAX], resolved2[PATH_MAX];
@@ -219,9 +233,11 @@ getversion(void)
 int
 main(int argc, char **argv)
 {
-	char					*path, *label, *cause, **var;
+	char					*path = NULL, *label = NULL;
+	char					*cause, **var;
 	const char				*s, *shell, *cwd;
-	int					 opt, flags, keys;
+	int					 opt, flags = 0, keys;
+	int					 feat = 0;
 	const struct options_table_entry	*oe;
 
 	if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL &&
@@ -238,14 +254,11 @@ main(int argc, char **argv)
 
 	if (**argv == '-')
 		flags = CLIENT_LOGIN;
-	else
-		flags = 0;
 
-	label = path = NULL;
-	while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:uUvV")) != -1) {
+	while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:T:uUvV")) != -1) {
 		switch (opt) {
 		case '2':
-			flags |= CLIENT_256COLOURS;
+			tty_add_features(&feat, "256", ":,");
 			break;
 		case 'c':
 			shell_command = optarg;
@@ -275,6 +288,9 @@ main(int argc, char **argv)
 			free(path);
 			path = xstrdup(optarg);
 			break;
+		case 'T':
+			tty_add_features(&feat, optarg, ":,");
+			break;
 		case 'u':
 			flags |= CLIENT_UTF8;
 			break;
@@ -321,9 +337,9 @@ main(int argc, char **argv)
 
 	global_environ = environ_create();
 	for (var = environ; *var != NULL; var++)
-		environ_put(global_environ, *var);
+		environ_put(global_environ, *var, 0);
 	if ((cwd = find_cwd()) != NULL)
-		environ_set(global_environ, "PWD", "%s", cwd);
+		environ_set(global_environ, "PWD", 0, "%s", cwd);
 
 	global_options = options_create(NULL);
 	global_s_options = options_create(NULL);
@@ -368,16 +384,19 @@ main(int argc, char **argv)
 			path[strcspn(path, ",")] = '\0';
 		}
 	}
-	if (path == NULL && (path = make_label(label, &cause)) == NULL) {
-		if (cause != NULL) {
-			fprintf(stderr, "%s\n", cause);
-			free(cause);
+	if (path == NULL) {
+		if ((path = make_label(label, &cause)) == NULL) {
+			if (cause != NULL) {
+				fprintf(stderr, "%s\n", cause);
+				free(cause);
+			}
+			exit(1);
 		}
-		exit(1);
+		flags |= CLIENT_DEFAULTSOCKET;
 	}
 	socket_path = path;
 	free(label);
 
 	/* Pass control to the client. */
-	exit(client_main(osdep_event_init(), argc, argv, flags));
+	exit(client_main(osdep_event_init(), argc, argv, flags, feat));
 }