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-set-option.c | |
| parent | c6d6af49039d7fc3ec14c2240153226709497313 (diff) | |
Validate command argument types (string or command list) and give more
useful error messages.
Diffstat (limited to 'cmd-set-option.c')
| -rw-r--r-- | cmd-set-option.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c index 8839dc0d..fbe32cfa 100644 --- a/cmd-set-option.c +++ b/cmd-set-option.c @@ -27,13 +27,16 @@ * Set an option. */ -static enum cmd_retval cmd_set_option_exec(struct cmd *, struct cmdq_item *); +static enum args_parse_type cmd_set_option_args_parse(struct args *, + u_int, char **); +static enum cmd_retval cmd_set_option_exec(struct cmd *, + struct cmdq_item *); const struct cmd_entry cmd_set_option_entry = { .name = "set-option", .alias = "set", - .args = { "aFgopqst:uUw", 1, 2, NULL }, + .args = { "aFgopqst:uUw", 1, 2, cmd_set_option_args_parse }, .usage = "[-aFgopqsuUw] " CMD_TARGET_PANE_USAGE " option [value]", .target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL }, @@ -46,7 +49,7 @@ const struct cmd_entry cmd_set_window_option_entry = { .name = "set-window-option", .alias = "setw", - .args = { "aFgoqt:u", 1, 2, NULL }, + .args = { "aFgoqt:u", 1, 2, cmd_set_option_args_parse }, .usage = "[-aFgoqu] " CMD_TARGET_WINDOW_USAGE " option [value]", .target = { 't', CMD_FIND_WINDOW, CMD_FIND_CANFAIL }, @@ -59,7 +62,7 @@ const struct cmd_entry cmd_set_hook_entry = { .name = "set-hook", .alias = NULL, - .args = { "agpRt:uw", 1, 2, NULL }, + .args = { "agpRt:uw", 1, 2, cmd_set_option_args_parse }, .usage = "[-agpRuw] " CMD_TARGET_PANE_USAGE " hook [command]", .target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL }, @@ -68,6 +71,15 @@ const struct cmd_entry cmd_set_hook_entry = { .exec = cmd_set_option_exec }; +static enum args_parse_type +cmd_set_option_args_parse(__unused struct args *args, u_int idx, + __unused char **cause) +{ + if (idx == 1) + return (ARGS_PARSE_COMMANDS_OR_STRING); + return (ARGS_PARSE_STRING); +} + static enum cmd_retval cmd_set_option_exec(struct cmd *self, struct cmdq_item *item) { |