Merge branch 'obsd-master'

12 files changed, 220 insertions, 128 deletions

diff --git a/client.c b/client.c
index bb9fedf2..d137501a 100644
--- a/client.c
+++ b/client.c
@@ -215,14 +215,13 @@ client_exit_message(void)
 int
 client_main(struct event_base *base, int argc, char **argv, int flags)
 {
+	struct cmd_parse_result	*pr;
 	struct cmd		*cmd;
-	struct cmd_list		*cmdlist;
 	struct msg_command_data	*data;
 	int			 cmdflags, fd, i;
 	const char		*ttynam, *cwd;
 	pid_t			 ppid;
 	enum msgtype		 msg;
-	char			*cause;
 	struct termios		 tio, saved_tio;
 	size_t			 size;
 
@@ -248,14 +247,15 @@ client_main(struct event_base *base, int argc, char **argv, int flags)
 		 * later in server) but it is necessary to get the start server
 		 * flag.
 		 */
-		cmdlist = cmd_list_parse(argc, argv, NULL, 0, &cause);
-		if (cmdlist != NULL) {
-			TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
+		pr = cmd_parse_from_arguments(argc, argv, NULL);
+		if (pr->status == CMD_PARSE_SUCCESS) {
+			TAILQ_FOREACH(cmd, &pr->cmdlist->list, qentry) {
 				if (cmd->entry->flags & CMD_STARTSERVER)
 					cmdflags |= CMD_STARTSERVER;
 			}
-			cmd_list_free(cmdlist);
-		}
+			cmd_list_free(pr->cmdlist);
+		} else
+			free(pr->error);
 	}
 
 	/* Create client process structure (starts logging). */
diff --git a/cmd-bind-key.c b/cmd-bind-key.c
index 97af9f57..ed2f69d1 100644
--- a/cmd-bind-key.c
+++ b/cmd-bind-key.c
@@ -44,11 +44,10 @@ const struct cmd_entry cmd_bind_key_entry = {
 static enum cmd_retval
 cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item)
 {
-	struct args	*args = self->args;
-	char		*cause;
-	struct cmd_list	*cmdlist;
-	key_code	 key;
-	const char	*tablename;
+	struct args		*args = self->args;
+	key_code		 key;
+	const char		*tablename;
+	struct cmd_parse_result	*pr;
 
 	key = key_string_lookup_string(args->argv[0]);
 	if (key == KEYC_NONE || key == KEYC_UNKNOWN) {
@@ -63,14 +62,18 @@ cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item)
 	else
 		tablename = "prefix";
 
-	cmdlist = cmd_list_parse(args->argc - 1, args->argv + 1, NULL, 0,
-	    &cause);
-	if (cmdlist == NULL) {
-		cmdq_error(item, "%s", cause);
-		free(cause);
+	pr = cmd_parse_from_arguments(args->argc - 1, args->argv + 1, NULL);
+	switch (pr->status) {
+	case CMD_PARSE_EMPTY:
+		cmdq_error(item, "empty command");
 		return (CMD_RETURN_ERROR);
+	case CMD_PARSE_ERROR:
+		cmdq_error(item, "%s", pr->error);
+		free(pr->error);
+		return (CMD_RETURN_ERROR);
+	case CMD_PARSE_SUCCESS:
+		break;
 	}
-
-	key_bindings_add(tablename, key, args_has(args, 'r'), cmdlist);
+	key_bindings_add(tablename, key, args_has(args, 'r'), pr->cmdlist);
 	return (CMD_RETURN_NORMAL);
 }
diff --git a/cmd-if-shell.c b/cmd-if-shell.c
index 40e2b1c3..84f66657 100644
--- a/cmd-if-shell.c
+++ b/cmd-if-shell.c
@@ -159,7 +159,7 @@ cmd_if_shell_callback(struct job *job)
 	struct cmd_if_shell_data	*cdata = job_get_data(job);
 	struct client			*c = cdata->client;
 	struct mouse_event		*m = &cdata->mouse;
-	struct cmdq_item		*new_item;
+	struct cmdq_item		*new_item = NULL;
 	char				*cmd;
 	int				 status;
 	struct cmd_parse_result		*pr;
@@ -175,10 +175,10 @@ cmd_if_shell_callback(struct job *job)
 	pr = cmd_parse_from_string(cmd, &cdata->input);
 	switch (pr->status) {
 	case CMD_PARSE_EMPTY:
-		new_item = NULL;
 		break;
 	case CMD_PARSE_ERROR:
-		new_item = cmdq_get_error(pr->error);
+		if (cdata->item != NULL)
+		       cmdq_error(cdata->item, "%s", pr->error);
 		free(pr->error);
 		break;
 	case CMD_PARSE_SUCCESS:
diff --git a/cmd-list.c b/cmd-list.c
index fdf2095d..82ffe55c 100644
--- a/cmd-list.c
+++ b/cmd-list.c
@@ -56,62 +56,6 @@ cmd_list_move(struct cmd_list *cmdlist, struct cmd_list *from)
 	cmdlist->group = cmd_list_next_group++;
 }
 
-struct cmd_list *
-cmd_list_parse(int argc, char **argv, const char *file, u_int line,
-    char **cause)
-{
-	struct cmd_list	*cmdlist;
-	struct cmd	*cmd;
-	int		 i, lastsplit;
-	size_t		 arglen, new_argc;
-	char	       **copy_argv, **new_argv;
-
-	copy_argv = cmd_copy_argv(argc, argv);
-
-	cmdlist = cmd_list_new();
-
-	lastsplit = 0;
-	for (i = 0; i < argc; i++) {
-		arglen = strlen(copy_argv[i]);
-		if (arglen == 0 || copy_argv[i][arglen - 1] != ';')
-			continue;
-		copy_argv[i][arglen - 1] = '\0';
-
-		if (arglen > 1 && copy_argv[i][arglen - 2] == '\\') {
-			copy_argv[i][arglen - 2] = ';';
-			continue;
-		}
-
-		new_argc = i - lastsplit;
-		new_argv = copy_argv + lastsplit;
-		if (arglen != 1)
-			new_argc++;
-
-		cmd = cmd_parse(new_argc, new_argv, file, line, cause);
-		if (cmd == NULL)
-			goto bad;
-		TAILQ_INSERT_TAIL(&cmdlist->list, cmd, qentry);
-
-		lastsplit = i + 1;
-	}
-
-	if (lastsplit != argc) {
-		cmd = cmd_parse(argc - lastsplit, copy_argv + lastsplit,
-		    file, line, cause);
-		if (cmd == NULL)
-			goto bad;
-		TAILQ_INSERT_TAIL(&cmdlist->list, cmd, qentry);
-	}
-
-	cmd_free_argv(argc, copy_argv);
-	return (cmdlist);
-
-bad:
-	cmd_list_free(cmdlist);
-	cmd_free_argv(argc, copy_argv);
-	return (NULL);
-}
-
 void
 cmd_list_free(struct cmd_list *cmdlist)
 {
diff --git a/cmd-parse.y b/cmd-parse.y
index e9ca376c..be7c0039 100644
--- a/cmd-parse.y
+++ b/cmd-parse.y
@@ -541,34 +541,21 @@ cmd_parse_run_parser(FILE *f, struct cmd_parse_input *pi, char **cause)
 	return (cmds);
 }
 
-struct cmd_parse_result *
-cmd_parse_from_file(FILE *f, struct cmd_parse_input *pi)
+static struct cmd_parse_result *
+cmd_parse_build_commands(struct cmd_parse_commands *cmds,
+    struct cmd_parse_input *pi)
 {
 	static struct cmd_parse_result	 pr;
-	struct cmd_parse_input		 input;
-	struct cmd_parse_commands	*cmds, *cmds2;
+	struct cmd_parse_commands	*cmds2;
 	struct cmd_parse_command	*cmd, *cmd2, *next, *next2, *after;
+	FILE				*f;
 	u_int				 line = UINT_MAX;
 	int				 i;
 	struct cmd_list			*cmdlist = NULL, *result;
 	struct cmd			*add;
 	char				*alias, *cause, *s;
 
-	if (pi == NULL) {
-		memset(&input, 0, sizeof input);
-		pi = &input;
-	}
-	memset(&pr, 0, sizeof pr);
-
-	/*
-	 * Parse the file into a list of commands.
-	 */
-	cmds = cmd_parse_run_parser(f, pi, &cause);
-	if (cmds == NULL) {
-		pr.status = CMD_PARSE_ERROR;
-		pr.error = cause;
-		return (&pr);
-	}
+	/* Check for an empty list. */
 	if (TAILQ_EMPTY(cmds)) {
 		free(cmds);
 		pr.status = CMD_PARSE_EMPTY;
@@ -678,12 +665,45 @@ out:
 }
 
 struct cmd_parse_result *
+cmd_parse_from_file(FILE *f, struct cmd_parse_input *pi)
+{
+	static struct cmd_parse_result	 pr;
+	struct cmd_parse_input		 input;
+	struct cmd_parse_commands	*cmds;
+	char				*cause;
+
+	if (pi == NULL) {
+		memset(&input, 0, sizeof input);
+		pi = &input;
+	}
+	memset(&pr, 0, sizeof pr);
+
+	/*
+	 * Parse the file into a list of commands.
+	 */
+	cmds = cmd_parse_run_parser(f, pi, &cause);
+	if (cmds == NULL) {
+		pr.status = CMD_PARSE_ERROR;
+		pr.error = cause;
+		return (&pr);
+	}
+	return (cmd_parse_build_commands(cmds, pi));
+}
+
+struct cmd_parse_result *
 cmd_parse_from_string(const char *s, struct cmd_parse_input *pi)
 {
 	static struct cmd_parse_result	 pr;
 	struct cmd_parse_result		*prp;
+	struct cmd_parse_input		 input;
 	FILE				*f;
 
+	if (pi == NULL) {
+		memset(&input, 0, sizeof input);
+		pi = &input;
+	}
+	memset(&pr, 0, sizeof pr);
+
 	if (*s == '\0') {
 		pr.status = CMD_PARSE_EMPTY;
 		pr.cmdlist = NULL;
@@ -703,6 +723,84 @@ cmd_parse_from_string(const char *s, struct cmd_parse_input *pi)
 	return (prp);
 }
 
+struct cmd_parse_result *
+cmd_parse_from_arguments(int argc, char **argv, struct cmd_parse_input *pi)
+{
+	struct cmd_parse_input		  input;
+	struct cmd_parse_commands	 *cmds;
+	struct cmd_parse_command	 *cmd;
+	char				**copy, **new_argv;
+	size_t				  size;
+	int				  i, last, new_argc;
+
+	/*
+	 * The commands are already split up into arguments, so just separate
+	 * into a set of commands by ';'.
+	 */
+
+	if (pi == NULL) {
+		memset(&input, 0, sizeof input);
+		pi = &input;
+	}
+	cmd_log_argv(argc, argv, "%s", __func__);
+
+	cmds = xmalloc(sizeof *cmds);
+	TAILQ_INIT(cmds);
+	copy = cmd_copy_argv(argc, argv);
+
+	last = 0;
+	for (i = 0; i < argc; i++) {
+		size = strlen(copy[i]);
+		if (size == 0 || copy[i][size - 1] != ';')
+			continue;
+		copy[i][--size] = '\0';
+		if (size > 0 && copy[i][size - 1] == '\\') {
+			copy[i][size - 1] = ';';
+			continue;
+		}
+
+		new_argc = i - last;
+		new_argv = copy + last;
+		if (size != 0)
+			new_argc++;
+
+		if (new_argc != 0) {
+			cmd_log_argv(new_argc, new_argv, "%s: at %u", __func__,
+			    i);
+
+			cmd = xcalloc(1, sizeof *cmd);
+			cmd->name = xstrdup(new_argv[0]);
+			cmd->line = pi->line;
+
+			cmd->argc = new_argc - 1;
+			cmd->argv = cmd_copy_argv(new_argc - 1, new_argv + 1);
+
+			TAILQ_INSERT_TAIL(cmds, cmd, entry);
+		}
+
+		last = i + 1;
+	}
+	if (last != argc) {
+		new_argv = copy + last;
+		new_argc = argc - last;
+
+		if (new_argc != 0) {
+			cmd_log_argv(new_argc, new_argv, "%s: at %u", __func__,
+			    last);
+
+			cmd = xcalloc(1, sizeof *cmd);
+			cmd->name = xstrdup(new_argv[0]);
+			cmd->line = pi->line;
+
+			cmd->argc = new_argc - 1;
+			cmd->argv = cmd_copy_argv(new_argc - 1, new_argv + 1);
+
+			TAILQ_INSERT_TAIL(cmds, cmd, entry);
+		}
+	}
+	return (cmd_parse_build_commands(cmds, pi));
+}
+
 static int printflike(1, 2)
 yyerror(const char *fmt, ...)
 {
diff --git a/cmd-queue.c b/cmd-queue.c
index 0cfa57fe..f08d7c02 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -32,11 +32,14 @@ static struct cmdq_list global_queue = TAILQ_HEAD_INITIALIZER(global_queue);
 static const char *
 cmdq_name(struct client *c)
 {
-	static char	s[32];
+	static char	s[256];
 
 	if (c == NULL)
 		return ("<global>");
-	xsnprintf(s, sizeof s, "<%p>", c);
+	if (c->name != NULL)
+		xsnprintf(s, sizeof s, "<%s>", c->name);
+	else
+		xsnprintf(s, sizeof s, "<%p>", c);
 	return (s);
 }
 
diff --git a/cmd.c b/cmd.c
index e3dd9853..81073ec1 100644
--- a/cmd.c
+++ b/cmd.c
@@ -204,13 +204,20 @@ const struct cmd_entry *cmd_table[] = {
 	NULL
 };
 
-void
-cmd_log_argv(int argc, char **argv, const char *prefix)
+void printflike(3, 4)
+cmd_log_argv(int argc, char **argv, const char *fmt, ...)
 {
-	int	i;
+	char	*prefix;
+	va_list	 ap;
+	int	 i;
+
+	va_start(ap, fmt);
+	xvasprintf(&prefix, fmt, ap);
+	va_end(ap);
 
 	for (i = 0; i < argc; i++)
 		log_debug("%s: argv[%d]=%s", prefix, i, argv[i]);
+	free(prefix);
 }
 
 void
@@ -244,7 +251,7 @@ cmd_pack_argv(int argc, char **argv, char *buf, size_t len)
 
 	if (argc == 0)
 		return (0);
-	cmd_log_argv(argc, argv, __func__);
+	cmd_log_argv(argc, argv, "%s", __func__);
 
 	*buf = '\0';
 	for (i = 0; i < argc; i++) {
@@ -281,7 +288,7 @@ cmd_unpack_argv(char *buf, size_t len, int argc, char ***argv)
 		buf += arglen;
 		len -= arglen;
 	}
-	cmd_log_argv(argc, *argv, __func__);
+	cmd_log_argv(argc, *argv, "%s", __func__);
 
 	return (0);
 }
@@ -373,9 +380,9 @@ cmd_get_alias(const char *name)
 static const struct cmd_entry *
 cmd_find(const char *name, char **cause)
 {
-	const struct cmd_entry **loop, *entry, *found = NULL;
-	int			 ambiguous;
-	char			 s[BUFSIZ];
+	const struct cmd_entry	**loop, *entry, *found = NULL;
+	int			  ambiguous;
+	char			  s[BUFSIZ];
 
 	ambiguous = 0;
 	for (loop = cmd_table; *loop != NULL; loop++) {
@@ -436,7 +443,7 @@ cmd_parse(int argc, char **argv, const char *file, u_int line, char **cause)
 	entry = cmd_find(name, cause);
 	if (entry == NULL)
 		return (NULL);
-	cmd_log_argv(argc, argv, entry->name);
+	cmd_log_argv(argc, argv, "%s: %s", __func__, entry->name);
 
 	args = args_parse(entry->args.template, argc, argv);
 	if (args == NULL)
diff --git a/format.c b/format.c
index b7fedaab..4a5b92e8 100644
--- a/format.c
+++ b/format.c
@@ -1152,13 +1152,13 @@ format_build_modifiers(struct format_tree *ft, const char **s, u_int *count)
 
 	/*
 	 * Modifiers are a ; separated list of the forms:
-	 *      l,m,C,b,d,t,q,E,T,S,W,P
+	 *      l,m,C,b,d,t,q,E,T,S,W,P,<,>
 	 *	=a
 	 *	=/a
 	 *      =/a/
 	 *	s/a/b/
 	 *	s/a/b
-	 *	||,&&,!=,==
+	 *	||,&&,!=,==,<=,>=
 	 */
 
 	*count = 0;
@@ -1169,7 +1169,7 @@ format_build_modifiers(struct format_tree *ft, const char **s, u_int *count)
 			cp++;
 
 		/* Check single character modifiers with no arguments. */
-		if (strchr("lmCbdtqETSWP", cp[0]) != NULL &&
+		if (strchr("lmCbdtqETSWP<>", cp[0]) != NULL &&
 		    format_is_end(cp[1])) {
 			format_add_modifier(&list, count, cp, 1, NULL, 0);
 			cp++;
@@ -1180,7 +1180,9 @@ format_build_modifiers(struct format_tree *ft, const char **s, u_int *count)
 		if ((memcmp("||", cp, 2) == 0 ||
 		    memcmp("&&", cp, 2) == 0 ||
 		    memcmp("!=", cp, 2) == 0 ||
-		    memcmp("==", cp, 2) == 0) &&
+		    memcmp("==", cp, 2) == 0 ||
+		    memcmp("<=", cp, 2) == 0 ||
+		    memcmp(">=", cp, 2) == 0) &&
 		    format_is_end(cp[2])) {
 			format_add_modifier(&list, count, cp, 2, NULL, 0);
 			cp += 2;
@@ -1449,6 +1451,8 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
 		if (fm->size == 1) {
 			switch (fm->modifier[0]) {
 			case 'm':
+			case '<':
+			case '>':
 				cmp = fm;
 				break;
 			case 'C':
@@ -1502,7 +1506,9 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
 			if (strcmp(fm->modifier, "||") == 0 ||
 			    strcmp(fm->modifier, "&&") == 0 ||
 			    strcmp(fm->modifier, "==") == 0 ||
-			    strcmp(fm->modifier, "!=") == 0)
+			    strcmp(fm->modifier, "!=") == 0 ||
+			    strcmp(fm->modifier, ">=") == 0 ||
+			    strcmp(fm->modifier, "<=") == 0)
 				cmp = fm;
 		}
 	}
@@ -1565,8 +1571,27 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
 				value = xstrdup("1");
 			else
 				value = xstrdup("0");
-		}
-		else if (strcmp(cmp->modifier, "m") == 0) {
+		} else if (strcmp(cmp->modifier, "<") == 0) {
+			if (strcmp(left, right) < 0)
+				value = xstrdup("1");
+			else
+				value = xstrdup("0");
+		} else if (strcmp(cmp->modifier, ">") == 0) {
+			if (strcmp(left, right) > 0)
+				value = xstrdup("1");
+			else
+				value = xstrdup("0");
+		} else if (strcmp(cmp->modifier, "<=") == 0) {
+			if (strcmp(left, right) <= 0)
+				value = xstrdup("1");
+			else
+				value = xstrdup("0");
+		} else if (strcmp(cmp->modifier, ">=") == 0) {
+			if (strcmp(left, right) >= 0)
+				value = xstrdup("1");
+			else
+				value = xstrdup("0");
+		} else if (strcmp(cmp->modifier, "m") == 0) {
 			if (fnmatch(left, right, 0) == 0)
 				value = xstrdup("1");
 			else
diff --git a/server-client.c b/server-client.c
index 47c513fc..7381eb52 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1785,9 +1785,9 @@ server_client_dispatch_command(struct client *c, struct imsg *imsg)
 	struct msg_command_data	  data;
 	char			 *buf;
 	size_t			  len;
-	struct cmd_list		 *cmdlist = NULL;
 	int			  argc;
 	char			**argv, *cause;
+	struct cmd_parse_result	 *pr;
 
 	if (c->flags & CLIENT_EXIT)
 		return;
@@ -1813,24 +1813,31 @@ server_client_dispatch_command(struct client *c, struct imsg *imsg)
 		*argv = xstrdup("new-session");
 	}
 
-	if ((cmdlist = cmd_list_parse(argc, argv, NULL, 0, &cause)) == NULL) {
-		cmd_free_argv(argc, argv);
+	pr = cmd_parse_from_arguments(argc, argv, NULL);
+	switch (pr->status) {
+	case CMD_PARSE_EMPTY:
+		cause = xstrdup("empty command");
 		goto error;
+	case CMD_PARSE_ERROR:
+		cause = pr->error;
+		goto error;
+	case CMD_PARSE_SUCCESS:
+		break;
 	}
 	cmd_free_argv(argc, argv);
 
-	cmdq_append(c, cmdq_get_command(cmdlist, NULL, NULL, 0));
+	cmdq_append(c, cmdq_get_command(pr->cmdlist, NULL, NULL, 0));
 	cmdq_append(c, cmdq_get_callback(server_client_command_done, NULL));
-	cmd_list_free(cmdlist);
+
+	cmd_list_free(pr->cmdlist);
 	return;
 
 error:
+	cmd_free_argv(argc, argv);
+
 	cmdq_append(c, cmdq_get_error(cause));
 	free(cause);
 
-	if (cmdlist != NULL)
-		cmd_list_free(cmdlist);
-
 	c->flags |= CLIENT_EXIT;
 }
 
diff --git a/spawn.c b/spawn.c
index e7ccfe0f..12409975 100644
--- a/spawn.c
+++ b/spawn.c
@@ -327,7 +327,7 @@ spawn_pane(struct spawn_context *sc, char **cause)
 	}
 	if (cwd != NULL)
 		log_debug("%s: cwd=%s", __func__, cwd);
-	cmd_log_argv(new_wp->argc, new_wp->argv, __func__);
+	cmd_log_argv(new_wp->argc, new_wp->argv, "%s", __func__);
 	environ_log(child, "%s: environment ", __func__);
 
 	/* If the command is empty, don't fork a child process. */
diff --git a/tmux.1 b/tmux.1
index 3c86ab60..927df8e4 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3951,9 +3951,13 @@ For example:
 .Pp
 Comparisons may be expressed by prefixing two comma-separated
 alternatives by
-.Ql ==
+.Ql == ,
+.Ql != ,
+.Ql < ,
+.Ql > ,
+.Ql <=
 or
-.Ql !=
+.Ql >=
 and a colon.
 For example
 .Ql #{==:#{host},myhost}
diff --git a/tmux.h b/tmux.h
index fa79339a..a967e5f3 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1989,7 +1989,7 @@ int		 cmd_find_from_mouse(struct cmd_find_state *,
 int		 cmd_find_from_nothing(struct cmd_find_state *, int);
 
 /* cmd.c */
-void		 cmd_log_argv(int, char **, const char *);
+void printflike(3, 4) cmd_log_argv(int, char **, const char *, ...);
 void		 cmd_prepend_argv(int *, char ***, char *);
 void		 cmd_append_argv(int *, char ***, char *);
 int		 cmd_pack_argv(int, char **, char *, size_t);
@@ -2018,12 +2018,13 @@ void	    	 cmd_parse_empty(struct cmd_parse_input *);
 struct cmd_parse_result *cmd_parse_from_file(FILE *, struct cmd_parse_input *);
 struct cmd_parse_result *cmd_parse_from_string(const char *,
 		     struct cmd_parse_input *);
+struct cmd_parse_result *cmd_parse_from_arguments(int, char **,
+		     struct cmd_parse_input *);
 
 /* cmd-list.c */
 struct cmd_list	*cmd_list_new(void);
 void		 cmd_list_append(struct cmd_list *, struct cmd *);
 void		 cmd_list_move(struct cmd_list *, struct cmd_list *);
-struct cmd_list	*cmd_list_parse(int, char **, const char *, u_int, char **);
 void		 cmd_list_free(struct cmd_list *);
 char		*cmd_list_print(struct cmd_list *, int);