diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-04-13 22:01:30 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-04-13 22:01:30 +0100 |
| commit | 2159ff3256df4b823dfaed24e64047249cf079c2 (patch) | |
| tree | 5652805f202533dd5367bac6659bcf1d558a9348 /cmd-command-prompt.c | |
| parent | acc00cd13a767067f85ed27d52ad543c9a58869c (diff) | |
| parent | 187277eaadc4a675659bf7ede88f50bfe6cc7be9 (diff) | |
| download | rtmux-2159ff3256df4b823dfaed24e64047249cf079c2.tar.gz rtmux-2159ff3256df4b823dfaed24e64047249cf079c2.tar.bz2 rtmux-2159ff3256df4b823dfaed24e64047249cf079c2.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-command-prompt.c')
| -rw-r--r-- | cmd-command-prompt.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c index 81f392f5..510600e3 100644 --- a/cmd-command-prompt.c +++ b/cmd-command-prompt.c @@ -136,10 +136,9 @@ cmd_command_prompt_callback(struct client *c, void *data, const char *s, int done) { struct cmd_command_prompt_cdata *cdata = data; - struct cmdq_item *new_item; - char *new_template, *prompt, *ptr; + char *new_template, *prompt, *ptr, *error; char *input = NULL; - struct cmd_parse_result *pr; + enum cmd_parse_status status; if (s == NULL) return (0); @@ -166,21 +165,10 @@ cmd_command_prompt_callback(struct client *c, void *data, const char *s, return (1); } - pr = cmd_parse_from_string(new_template, NULL); - switch (pr->status) { - case CMD_PARSE_EMPTY: - new_item = NULL; - break; - case CMD_PARSE_ERROR: - new_item = cmdq_get_error(pr->error); - free(pr->error); - cmdq_append(c, new_item); - break; - case CMD_PARSE_SUCCESS: - new_item = cmdq_get_command(pr->cmdlist, NULL); - cmd_list_free(pr->cmdlist); - cmdq_append(c, new_item); - break; + status = cmd_parse_and_append(new_template, NULL, c, NULL, &error); + if (status == CMD_PARSE_ERROR) { + cmdq_append(c, cmdq_get_error(error)); + free(error); } if (!done) |