circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-07-03 10:22:29 +00:00
Code Issues Projects Releases Wiki Activity

Fail on any error.

Browse Source
This commit is contained in:
Nicholas Marriott
2026-06-30 18:59:45 +01:00
parent 7a1cc1d443
commit 298b35c8a9
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmd-parse.y
View File

@@ -1282,8 +1282,10 @@ cmd_parse_command_any_have(struct cmd_parse_node *node, int flag)
case CMD_PARSE_STRING: case CMD_PARSE_STRING:
values[count].type = ARGS_STRING; values[count].type = ARGS_STRING;
values[count].string = cmd_parse_make_string(child); values[count].string = cmd_parse_make_string(child);
if (values[count].string == NULL) if (values[count].string == NULL) {
found = -1;
goto out; goto out;
}
break; break;
case CMD_PARSE_COMMANDS: case CMD_PARSE_COMMANDS:
values[count].type = ARGS_COMMANDS; values[count].type = ARGS_COMMANDS;
@@ -1296,9 +1298,10 @@ cmd_parse_command_any_have(struct cmd_parse_node *node, int flag)
} }
cmd = cmd_parse(values, count, NULL, node->line, 0, &cause); cmd = cmd_parse(values, count, NULL, node->line, 0, &cause);
if (cmd == NULL) if (cmd == NULL) {
free(cause); free(cause);
else { found = -1;
} else {
if (cmd_get_entry(cmd)->flags & flag) if (cmd_get_entry(cmd)->flags & flag)
found = 1; found = 1;
cmd_free(cmd); cmd_free(cmd);
@@ -1314,6 +1317,7 @@ int
cmd_parse_any_have(struct cmd_parse_tree *tree, int flag) cmd_parse_any_have(struct cmd_parse_tree *tree, int flag)
{ {
struct cmd_parse_node *seq, *node; struct cmd_parse_node *seq, *node;
int found = 0, r;
TAILQ_FOREACH(seq, &tree->root->children, entry) { TAILQ_FOREACH(seq, &tree->root->children, entry) {
if (seq->type != CMD_PARSE_SEQUENCE) if (seq->type != CMD_PARSE_SEQUENCE)
@@ -1322,11 +1326,14 @@ cmd_parse_any_have(struct cmd_parse_tree *tree, int flag)
TAILQ_FOREACH(node, &seq->children, entry) { TAILQ_FOREACH(node, &seq->children, entry) {
if (node->type != CMD_PARSE_COMMAND) if (node->type != CMD_PARSE_COMMAND)
continue; continue;
if (cmd_parse_command_any_have(node, flag)) r = cmd_parse_command_any_have(node, flag);
return (1); if (r < 0)
return (0);
if (r)
found = 1;
} }
} }
return (0); return (found);
} }
static void printflike(1, 2) static void printflike(1, 2)