diff options
| author | nicm <nicm> | 2021-08-25 08:51:55 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2021-08-25 08:51:55 +0000 |
| commit | 03d173cbd8e72c356512a0e19e356b07d518627a (patch) | |
| tree | 3470ea9b0d06f58f84da38ba11c5bc9c015cb941 /cmd-if-shell.c | |
| parent | c6d6af49039d7fc3ec14c2240153226709497313 (diff) | |
Validate command argument types (string or command list) and give more
useful error messages.
Diffstat (limited to 'cmd-if-shell.c')
| -rw-r--r-- | cmd-if-shell.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/cmd-if-shell.c b/cmd-if-shell.c index 7804ef27..907a96e1 100644 --- a/cmd-if-shell.c +++ b/cmd-if-shell.c @@ -29,7 +29,10 @@ * Executes a tmux command if a shell command returns true or false. */ -static enum cmd_retval cmd_if_shell_exec(struct cmd *, struct cmdq_item *); +static enum args_parse_type cmd_if_shell_args_parse(struct args *, u_int, + char **); +static enum cmd_retval cmd_if_shell_exec(struct cmd *, + struct cmdq_item *); static void cmd_if_shell_callback(struct job *); static void cmd_if_shell_free(void *); @@ -38,7 +41,7 @@ const struct cmd_entry cmd_if_shell_entry = { .name = "if-shell", .alias = "if", - .args = { "bFt:", 2, 3, NULL }, + .args = { "bFt:", 2, 3, cmd_if_shell_args_parse }, .usage = "[-bF] " CMD_TARGET_PANE_USAGE " shell-command command " "[command]", @@ -56,6 +59,15 @@ struct cmd_if_shell_data { struct cmdq_item *item; }; +static enum args_parse_type +cmd_if_shell_args_parse(__unused struct args *args, u_int idx, + __unused char **cause) +{ + if (idx == 1 || idx == 2) + return (ARGS_PARSE_COMMANDS_OR_STRING); + return (ARGS_PARSE_STRING); +} + static enum cmd_retval cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item) { |