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

Do not report errors using client before one is set.

Browse Source
This commit is contained in:
Nicholas Marriott
2026-06-30 19:36:38 +01:00
parent 298b35c8a9
commit 186f51b7ee
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd-invoke.c
View File

@@ -316,6 +316,24 @@ cmd_invoke_if(struct cmdq_item *item, struct cmd_invoke_state *is,
return (0); return (0);
} }
/* Report an error from an invoke item. */
static void
cmd_invoke_error(struct cmdq_item *item, struct cmd_invoke_state *is,
struct cmd_parse_node *node, const char *cause)
{
u_int line = cmd_parse_node_line(node);
if (cmdq_get_client(item) != NULL) {
cmdq_error(item, "%s", cause);
return;
}
if (is->file != NULL)
cfg_add_cause("%s:%u: %s", is->file, line, cause);
else
cfg_add_cause("%s", cause);
}
/* Build one command from a parsed command node. */ /* Build one command from a parsed command node. */
static struct cmd * static struct cmd *
cmd_invoke_build_command(struct cmdq_item *item, struct cmd_invoke_state *is, cmd_invoke_build_command(struct cmdq_item *item, struct cmd_invoke_state *is,
@@ -352,7 +370,7 @@ cmd_invoke_build_command(struct cmdq_item *item, struct cmd_invoke_state *is,
cmd = cmd_parse(values, count, is->file, cmd_parse_node_line(node), cmd = cmd_parse(values, count, is->file, cmd_parse_node_line(node),
is->parse_flags, &cause); is->parse_flags, &cause);
if (cmd == NULL) { if (cmd == NULL) {
cmdq_error(item, "%s", cause); cmd_invoke_error(item, is, node, cause);
free(cause); free(cause);
goto fail; goto fail;
} }