diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-08-21 20:01:22 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-08-21 20:01:22 +0100 |
| commit | 921991c98d6fd596c958b07b5f5aba7c434e8f9f (patch) | |
| tree | 42f00694a9edf1793209be4842987379d0171542 /cmd-parse.y | |
| parent | 4d3367e9657002c4b68867c8d58e2f5b7ae90612 (diff) | |
| parent | 63b6eec27889e4c38b4a051a1bb3463f153cc2c8 (diff) | |
| download | rtmux-921991c98d6fd596c958b07b5f5aba7c434e8f9f.tar.gz rtmux-921991c98d6fd596c958b07b5f5aba7c434e8f9f.tar.bz2 rtmux-921991c98d6fd596c958b07b5f5aba7c434e8f9f.zip | |
Merge branch 'obsd-master' into master
Diffstat (limited to 'cmd-parse.y')
| -rw-r--r-- | cmd-parse.y | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/cmd-parse.y b/cmd-parse.y index 458092b4..6be5d8a0 100644 --- a/cmd-parse.y +++ b/cmd-parse.y @@ -744,7 +744,8 @@ cmd_parse_expand_alias(struct cmd_parse_command *cmd, first = TAILQ_FIRST(&cmd->arguments); if (first == NULL || first->type != CMD_PARSE_STRING) { - pr->status = CMD_PARSE_EMPTY; + pr->status = CMD_PARSE_SUCCESS; + pr->cmdlist = cmd_list_new(); return (1); } name = first->string; @@ -840,7 +841,8 @@ cmd_parse_build_commands(struct cmd_parse_commands *cmds, /* Check for an empty list. */ if (TAILQ_EMPTY(cmds)) { - pr->status = CMD_PARSE_EMPTY; + pr->status = CMD_PARSE_SUCCESS; + pr->cmdlist = cmd_list_new(); return; } cmd_parse_log_commands(cmds, __func__); @@ -942,8 +944,6 @@ cmd_parse_and_insert(const char *s, struct cmd_parse_input *pi, pr = cmd_parse_from_string(s, pi); switch (pr->status) { - case CMD_PARSE_EMPTY: - break; case CMD_PARSE_ERROR: if (error != NULL) *error = pr->error; @@ -968,8 +968,6 @@ cmd_parse_and_append(const char *s, struct cmd_parse_input *pi, pr = cmd_parse_from_string(s, pi); switch (pr->status) { - case CMD_PARSE_EMPTY: - break; case CMD_PARSE_ERROR: if (error != NULL) *error = pr->error; @@ -1000,9 +998,8 @@ cmd_parse_from_buffer(const void *buf, size_t len, struct cmd_parse_input *pi) memset(&pr, 0, sizeof pr); if (len == 0) { - pr.status = CMD_PARSE_EMPTY; - pr.cmdlist = NULL; - pr.error = NULL; + pr.status = CMD_PARSE_SUCCESS; + pr.cmdlist = cmd_list_new(); return (&pr); } |