diff options
| -rw-r--r-- | CHANGES | 13 | ||||
| -rw-r--r-- | arguments.c | 61 | ||||
| -rw-r--r-- | cfg.c | 1 | ||||
| -rw-r--r-- | client.c | 14 | ||||
| -rw-r--r-- | cmd-bind-key.c | 27 | ||||
| -rw-r--r-- | cmd-if-shell.c | 6 | ||||
| -rw-r--r-- | cmd-list-keys.c | 13 | ||||
| -rw-r--r-- | cmd-list.c | 68 | ||||
| -rw-r--r-- | cmd-parse.y | 142 | ||||
| -rw-r--r-- | cmd-queue.c | 7 | ||||
| -rw-r--r-- | cmd-show-options.c | 4 | ||||
| -rw-r--r-- | cmd.c | 25 | ||||
| -rw-r--r-- | format-draw.c | 10 | ||||
| -rw-r--r-- | format.c | 39 | ||||
| -rw-r--r-- | options.c | 2 | ||||
| -rw-r--r-- | regress/control-client-size.sh | 6 | ||||
| -rw-r--r-- | server-client.c | 23 | ||||
| -rw-r--r-- | spawn.c | 2 | ||||
| -rw-r--r-- | tmux.1 | 8 | ||||
| -rw-r--r-- | tmux.h | 8 | ||||
| -rw-r--r-- | utf8.c | 9 |
21 files changed, 305 insertions, 183 deletions
@@ -1,12 +1,15 @@ CHANGES FROM 2.9 to X.X -* INCOMPATIBLE: tmux's configuration parsing has changed to use yacc(1) - instead. Most configuration files shouldn't need changing, however, the - following will need quoting: +* INCOMPATIBLE: tmux's configuration parsing has changed to use yacc(1). Most + configuration files shouldn't need to be changed but there are the following + differences: - #{} + 1) Formats now need to be quoted, so a bare #{...} becomes "#{...}". This + includes #{ which may previously have looked like a comment (for example at + the start of a line). - That is, formats, since it would otherwise be consisdered a comment. + 2) A \ on its own must be escaped or quoted as either \\ or '\' (the latter + works on older tmux versions). Entirely the same parser is now used for parsing the configuration file and for string commands. This means that constructs previously only diff --git a/arguments.c b/arguments.c index ebb746a0..bc978c34 100644 --- a/arguments.c +++ b/arguments.c @@ -140,23 +140,15 @@ static void args_print_add_value(char **buf, size_t *len, struct args_entry *entry, struct args_value *value) { - static const char quoted[] = " #\"';$"; - char *escaped; - int flags; + char *escaped; if (**buf != '\0') args_print_add(buf, len, " -%c ", entry->flag); else args_print_add(buf, len, "-%c ", entry->flag); - flags = VIS_OCTAL|VIS_TAB|VIS_NL; - if (value->value[strcspn(value->value, quoted)] != '\0') - flags |= VIS_DQ; - utf8_stravis(&escaped, value->value, flags); - if (flags & VIS_DQ) - args_print_add(buf, len, "\"%s\"", escaped); - else - args_print_add(buf, len, "%s", escaped); + escaped = args_escape(value->value); + args_print_add(buf, len, "%s", escaped); free(escaped); } @@ -164,21 +156,13 @@ args_print_add_value(char **buf, size_t *len, struct args_entry *entry, static void args_print_add_argument(char **buf, size_t *len, const char *argument) { - static const char quoted[] = " #\"';$"; - char *escaped; - int flags; + char *escaped; if (**buf != '\0') args_print_add(buf, len, " "); - flags = VIS_OCTAL|VIS_TAB|VIS_NL; - if (argument[strcspn(argument, quoted)] != '\0') - flags |= VIS_DQ; - utf8_stravis(&escaped, argument, flags); - if (flags & VIS_DQ) - args_print_add(buf, len, "\"%s\"", escaped); - else - args_print_add(buf, len, "%s", escaped); + escaped = args_escape(argument); + args_print_add(buf, len, "%s", escaped); free(escaped); } @@ -218,6 +202,39 @@ args_print(struct args *args) return (buf); } +/* Escape an argument. */ +char * +args_escape(const char *s) +{ + static const char quoted[] = " #\"';$"; + char *escaped, *result; + int flags; + + if ((strchr(quoted, s[0]) != NULL || s[0] == '~') && s[1] == '\0') { + xasprintf(&escaped, "\\%c", s[0]); + return (escaped); + } + + flags = VIS_OCTAL|VIS_TAB|VIS_NL; + if (s[strcspn(s, quoted)] != '\0') + flags |= VIS_DQ; + utf8_stravis(&escaped, s, flags); + + if (flags & VIS_DQ) { + if (*escaped == '~') + xasprintf(&result, "\"\\%s\"", escaped); + else + xasprintf(&result, "\"%s\"", escaped); + } else { + if (*escaped == '~') + xasprintf(&result, "\\%s", escaped); + else + result = xstrdup(escaped); + } + free(escaped); + return (result); +} + /* Return if an argument is present. */ int args_has(struct args *args, u_char ch) @@ -125,6 +125,7 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int flags, memset(&pi, 0, sizeof pi); pi.flags = flags; pi.file = path; + pi.line = 1; pr = cmd_parse_from_file(f, &pi); fclose(f); @@ -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-keys.c b/cmd-list-keys.c index 5efb0cd2..57f65c8e 100644 --- a/cmd-list-keys.c +++ b/cmd-list-keys.c @@ -60,8 +60,8 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item) struct args *args = self->args; struct key_table *table; struct key_binding *bd; - const char *key, *tablename, *r; - char *cp, tmp[BUFSIZ]; + const char *tablename, *r; + char *key, *cp, tmp[BUFSIZ]; int repeat, width, tablewidth, keywidth; if (self->entry == &cmd_list_commands_entry) @@ -83,7 +83,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item) } bd = key_bindings_first(table); while (bd != NULL) { - key = key_string_lookup_key(bd->key); + key = args_escape(key_string_lookup_key(bd->key)); if (bd->flags & KEY_BINDING_REPEAT) repeat = 1; @@ -95,6 +95,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item) if (width > keywidth) keywidth = width; + free(key); bd = key_bindings_next(table, bd); } table = key_bindings_next_table(table); @@ -108,7 +109,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item) } bd = key_bindings_first(table); while (bd != NULL) { - key = key_string_lookup_key(bd->key); + key = args_escape(key_string_lookup_key(bd->key)); if (!repeat) r = ""; @@ -128,11 +129,13 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item) strlcat(tmp, " ", sizeof tmp); free(cp); - cp = cmd_list_print(bd->cmdlist); + cp = cmd_list_print(bd->cmdlist, 1); strlcat(tmp, cp, sizeof tmp); free(cp); cmdq_print(item, "bind-key %s", tmp); + + free(key); bd = key_bindings_next(table, bd); } table = key_bindings_next_table(table); @@ -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) { @@ -129,7 +73,7 @@ cmd_list_free(struct cmd_list *cmdlist) } char * -cmd_list_print(struct cmd_list *cmdlist) +cmd_list_print(struct cmd_list *cmdlist, int escaped) { struct cmd *cmd; char *buf, *this; @@ -141,12 +85,16 @@ cmd_list_print(struct cmd_list *cmdlist) TAILQ_FOREACH(cmd, &cmdlist->list, qentry) { this = cmd_print(cmd); - len += strlen(this) + 3; + len += strlen(this) + 4; buf = xrealloc(buf, len); strlcat(buf, this, len); - if (TAILQ_NEXT(cmd, qentry) != NULL) - strlcat(buf, " ; ", len); + if (TAILQ_NEXT(cmd, qentry) != NULL) { + if (escaped) + strlcat(buf, " \\; ", len); + else + strlcat(buf, " ; ", len); + } free(this); } diff --git a/cmd-parse.y b/cmd-parse.y index 8b8f33ab..be7c0039 100644 --- a/cmd-parse.y +++ b/cmd-parse.y @@ -356,7 +356,7 @@ command : assignment TOKEN $$ = xcalloc(1, sizeof *$$); $$->name = $2; - $$->line = ps->input->line; + $$->line = ps->input->line - 1; } | assignment TOKEN arguments @@ -365,7 +365,7 @@ command : assignment TOKEN $$ = xcalloc(1, sizeof *$$); $$->name = $2; - $$->line = ps->input->line; + $$->line = ps->input->line - 1; $$->argc = $3.argc; $$->argv = $3.argv; @@ -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; @@ -663,7 +650,7 @@ cmd_parse_from_file(FILE *f, struct cmd_parse_input *pi) cmd_list_free(cmdlist); } - s = cmd_list_print(result); + s = cmd_list_print(result, 0); log_debug("%s: %s", __func__, s); free(s); @@ -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-show-options.c b/cmd-show-options.c index 37a9ca7b..756f763c 100644 --- a/cmd-show-options.c +++ b/cmd-show-options.c @@ -208,8 +208,8 @@ cmd_show_options_print(struct cmd *self, struct cmdq_item *item, if (args_has(self->args, 'v')) cmdq_print(item, "%s", value); else if (options_isstring(o)) { - utf8_stravis(&escaped, value, VIS_OCTAL|VIS_TAB|VIS_NL|VIS_DQ); - cmdq_print(item, "%s \"%s\"", name, escaped); + escaped = args_escape(value); + cmdq_print(item, "%s %s", name, escaped); free(escaped); } else cmdq_print(item, "%s %s", name, value); @@ -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-draw.c b/format-draw.c index 51404254..f8882ac2 100644 --- a/format-draw.c +++ b/format-draw.c @@ -345,12 +345,6 @@ format_draw_centre(struct screen_write_ctx *octx, u_int available, u_int ocx, /* Write left at 0. */ format_draw_put(octx, ocx, ocy, left, frs, 0, 0, width_left); - /* Write after at available - width_after. */ - format_draw_put(octx, ocx, ocy, after, frs, - available - width_after, - after->cx - width_after, - width_after); - /* Write right at available - width_right. */ format_draw_put(octx, ocx, ocy, right, frs, available - width_right, @@ -374,10 +368,10 @@ format_draw_centre(struct screen_write_ctx *octx, u_int available, u_int ocx, /* * Write after at - * middle + width_list / 2 - width_centre. + * middle - width_list / 2 + width_list */ format_draw_put(octx, ocx, ocy, after, frs, - middle + width_list / 2, + middle - width_list / 2 + width_list, 0, width_after); @@ -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 @@ -122,7 +122,7 @@ options_value_tostring(struct options_entry *o, union options_value *ov, char *s; if (OPTIONS_IS_COMMAND(o)) - return (cmd_list_print(ov->cmdlist)); + return (cmd_list_print(ov->cmdlist, 0)); if (OPTIONS_IS_STYLE(o)) return (xstrdup(style_tostring(&ov->style))); if (OPTIONS_IS_NUMBER(o)) { diff --git a/regress/control-client-size.sh b/regress/control-client-size.sh index dd1850c5..5847ede3 100644 --- a/regress/control-client-size.sh +++ b/regress/control-client-size.sh @@ -23,7 +23,7 @@ refresh -C 100,50 ls -F':#{window_width} #{window_height}' EOF grep ^: $TMP >$OUT -printf ":80 24\n:100 49\n"|cmp -s $OUT - || exit 1 +printf ":80 24\n:100 50\n"|cmp -s $OUT - || exit 1 $TMUX kill-server 2>/dev/null $TMUX -f/dev/null new -d || exit 1 @@ -34,7 +34,7 @@ refresh -C 80,24 ls -F':#{window_width} #{window_height}' EOF grep ^: $TMP >$OUT -printf ":80 24\n:80 23\n"|cmp -s $OUT - || exit 1 +printf ":80 24\n:80 24\n"|cmp -s $OUT - || exit 1 $TMUX kill-server 2>/dev/null cat <<EOF|$TMUX -f/dev/null -C new -x 100 -y 50 >$TMP @@ -43,7 +43,7 @@ refresh -C 80,24 ls -F':#{window_width} #{window_height}' EOF grep ^: $TMP >$OUT -printf ":100 50\n:80 23\n"|cmp -s $OUT - || exit 1 +printf ":100 50\n:80 24\n"|cmp -s $OUT - || exit 1 $TMUX kill-server 2>/dev/null exit 0 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; } @@ -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. */ @@ -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} @@ -1952,6 +1952,7 @@ void args_set(struct args *, u_char, const char *); struct args *args_parse(const char *, int, char **); void args_free(struct args *); char *args_print(struct args *); +char *args_escape(const char *); int args_has(struct args *, u_char); const char *args_get(struct args *, u_char); const char *args_first_value(struct args *, u_char, struct args_value **); @@ -1988,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); @@ -2017,14 +2018,15 @@ 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 *); +char *cmd_list_print(struct cmd_list *, int); /* cmd-queue.c */ struct cmdq_item *cmdq_get_command(struct cmd_list *, struct cmd_find_state *, @@ -18,6 +18,7 @@ #include <sys/types.h> +#include <ctype.h> #include <errno.h> #include <stdlib.h> #include <string.h> @@ -207,7 +208,13 @@ utf8_strvis(char *dst, const char *src, size_t len, int flag) /* Not a complete, valid UTF-8 character. */ src -= ud.have; } - if (src < end - 1) + if (src[0] == '$' && src < end - 1) { + if (isalpha((u_char)src[1]) || + src[1] == '_' || + src[1] == '{') + *dst++ = '\\'; + *dst++ = '$'; + } else if (src < end - 1) dst = vis(dst, src[0], flag, src[1]); else if (src < end) dst = vis(dst, src[0], flag, '\0'); |