diff options
| -rw-r--r-- | usr.bin/tmux/cmd-queue.c | 5 | ||||
| -rw-r--r-- | usr.bin/tmux/control.c | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 6 |
3 files changed, 7 insertions, 10 deletions
diff --git a/usr.bin/tmux/cmd-queue.c b/usr.bin/tmux/cmd-queue.c index 903a88026d4..68b5f1b2916 100644 --- a/usr.bin/tmux/cmd-queue.c +++ b/usr.bin/tmux/cmd-queue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-queue.c,v 1.65 2019/05/03 18:59:58 nicm Exp $ */ +/* $OpenBSD: cmd-queue.c,v 1.66 2019/05/18 21:14:10 nicm Exp $ */ /* * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -266,13 +266,14 @@ static enum cmd_retval cmdq_fire_command(struct cmdq_item *item) { struct client *c = item->client; + struct cmdq_shared *shared = item->shared; struct cmd *cmd = item->cmd; const struct cmd_entry *entry = cmd->entry; enum cmd_retval retval; struct cmd_find_state *fsp, fs; int flags; - flags = !!(cmd->flags & CMD_CONTROL); + flags = !!(shared->flags & CMDQ_SHARED_CONTROL); cmdq_guard(item, "begin", flags); if (item->client == NULL) diff --git a/usr.bin/tmux/control.c b/usr.bin/tmux/control.c index cd24941e092..79a27eb7e78 100644 --- a/usr.bin/tmux/control.c +++ b/usr.bin/tmux/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.20 2017/01/15 22:00:56 nicm Exp $ */ +/* $OpenBSD: control.c,v 1.21 2019/05/18 21:14:10 nicm Exp $ */ /* * Copyright (c) 2012 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -70,7 +70,6 @@ control_callback(struct client *c, int closed, __unused void *data) { char *line, *cause; struct cmd_list *cmdlist; - struct cmd *cmd; struct cmdq_item *item; if (closed) @@ -90,9 +89,8 @@ control_callback(struct client *c, int closed, __unused void *data) item = cmdq_get_callback(control_error, cause); cmdq_append(c, item); } else { - TAILQ_FOREACH(cmd, &cmdlist->list, qentry) - cmd->flags |= CMD_CONTROL; item = cmdq_get_command(cmdlist, NULL, NULL, 0); + item->shared->flags |= CMDQ_SHARED_CONTROL; cmdq_append(c, item); cmd_list_free(cmdlist); } diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 55aef4e1020..debbea42270 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.898 2019/05/13 20:10:23 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.899 2019/05/18 21:14:10 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1285,9 +1285,6 @@ struct cmd { char *file; u_int line; -#define CMD_CONTROL 0x1 - int flags; - TAILQ_ENTRY(cmd) qentry; }; @@ -1316,6 +1313,7 @@ struct cmdq_shared { int flags; #define CMDQ_SHARED_REPEAT 0x1 +#define CMDQ_SHARED_CONTROL 0x2 struct format_tree *formats; |