diff options
| author | nicm <nicm> | 2020-01-28 13:10:14 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2020-01-28 13:10:14 +0000 |
| commit | e3887022604d6ee6f922cdaa274b54cdf06020ba (patch) | |
| tree | 565673316c3ba9399d2592423c10885ae3253088 /cmd-parse.y | |
| parent | a6129e99749d2bbc8b4a991c7b5d09300aa55f39 (diff) | |
Ignore empty commands rather than adding them to the command list rather
than trying to skip them later, fixes problem reported by M Kelly.
Diffstat (limited to 'cmd-parse.y')
| -rw-r--r-- | cmd-parse.y | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cmd-parse.y b/cmd-parse.y index 41bcdaa8..2375370b 100644 --- a/cmd-parse.y +++ b/cmd-parse.y @@ -341,7 +341,8 @@ commands : command struct cmd_parse_state *ps = &parse_state; $$ = cmd_parse_new_commands(); - if (ps->scope == NULL || ps->scope->flag) + if ($1->name != NULL && + (ps->scope == NULL || ps->scope->flag)) TAILQ_INSERT_TAIL($$, $1, entry); else cmd_parse_free_command($1); @@ -360,7 +361,8 @@ commands : command { struct cmd_parse_state *ps = &parse_state; - if (ps->scope == NULL || ps->scope->flag) { + if ($3->name != NULL && + (ps->scope == NULL || ps->scope->flag)) { $$ = $1; TAILQ_INSERT_TAIL($$, $3, entry); } else { @@ -641,8 +643,6 @@ cmd_parse_build_commands(struct cmd_parse_commands *cmds, * command list. */ TAILQ_FOREACH_SAFE(cmd, cmds, entry, next) { - if (cmd->name == NULL) - continue; alias = cmd_get_alias(cmd->name); if (alias == NULL) continue; @@ -688,8 +688,6 @@ cmd_parse_build_commands(struct cmd_parse_commands *cmds, */ result = cmd_list_new(); TAILQ_FOREACH(cmd, cmds, entry) { - if (cmd->name == NULL) - continue; log_debug("%s: %u %s", __func__, cmd->line, cmd->name); cmd_log_argv(cmd->argc, cmd->argv, __func__); |