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-confirm-before.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-confirm-before.c')
| -rw-r--r-- | cmd-confirm-before.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/cmd-confirm-before.c b/cmd-confirm-before.c index 7850706e..026d0e11 100644 --- a/cmd-confirm-before.c +++ b/cmd-confirm-before.c @@ -87,8 +87,8 @@ cmd_confirm_before_callback(struct client *c, void *data, const char *s, __unused int done) { struct cmd_confirm_before_data *cdata = data; - struct cmdq_item *new_item; - struct cmd_parse_result *pr; + char *error; + enum cmd_parse_status status; if (c->flags & CLIENT_DEAD) return (0); @@ -98,21 +98,10 @@ cmd_confirm_before_callback(struct client *c, void *data, const char *s, if (tolower((u_char)s[0]) != 'y' || s[1] != '\0') return (0); - pr = cmd_parse_from_string(cdata->cmd, 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(cdata->cmd, NULL, c, NULL, &error); + if (status == CMD_PARSE_ERROR) { + cmdq_append(c, cmdq_get_error(error)); + free(error); } return (0); |