diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-04-14 00:01:41 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-04-14 00:01:41 +0100 |
| commit | 653a159225609f7e5efb45bc78cdf7b480d7ef93 (patch) | |
| tree | de075bcb7fdbd8a3fbd9f800c3a04c63cfdfac6b /cmd-command-prompt.c | |
| parent | 2159ff3256df4b823dfaed24e64047249cf079c2 (diff) | |
| parent | fc83517913c8280c222a6cf78ca7fb8053421b37 (diff) | |
| download | rtmux-653a159225609f7e5efb45bc78cdf7b480d7ef93.tar.gz rtmux-653a159225609f7e5efb45bc78cdf7b480d7ef93.tar.bz2 rtmux-653a159225609f7e5efb45bc78cdf7b480d7ef93.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-command-prompt.c')
| -rw-r--r-- | cmd-command-prompt.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c index 510600e3..e53c4320 100644 --- a/cmd-command-prompt.c +++ b/cmd-command-prompt.c @@ -44,7 +44,7 @@ const struct cmd_entry cmd_command_prompt_entry = { .usage = "[-1kiN] [-I inputs] [-p prompts] " CMD_TARGET_CLIENT_USAGE " " "[template]", - .flags = 0, + .flags = CMD_CLIENT_TFLAG, .exec = cmd_command_prompt_exec }; @@ -65,16 +65,13 @@ static enum cmd_retval cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = cmd_get_args(self); + struct client *tc = cmdq_get_target_client(item); const char *inputs, *prompts; struct cmd_command_prompt_cdata *cdata; - struct client *c; char *prompt, *ptr, *input = NULL; size_t n; - if ((c = cmd_find_client(item, args_get(args, 't'), 0)) == NULL) - return (CMD_RETURN_ERROR); - - if (c->prompt_string != NULL) + if (tc->prompt_string != NULL) return (CMD_RETURN_NORMAL); cdata = xcalloc(1, sizeof *cdata); @@ -124,7 +121,7 @@ cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item) cdata->flags |= PROMPT_INCREMENTAL; else if (args_has(args, 'k')) cdata->flags |= PROMPT_KEY; - status_prompt_set(c, prompt, input, cmd_command_prompt_callback, + status_prompt_set(tc, prompt, input, cmd_command_prompt_callback, cmd_command_prompt_free, cdata, cdata->flags); free(prompt); |