diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-05-27 15:02:28 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-05-27 15:02:28 +0100 |
| commit | d4bf4bd7c7702433f713fd31a1f84cb9b189f514 (patch) | |
| tree | 0666b46613506e471919a021e810f8048c716114 /cmd-bind-key.c | |
| parent | 522d1bd3091aeb3094554ebd6ee28be124fc5393 (diff) | |
| parent | ae3eba6e08a8ff36a63b328880d4a97f21e1108b (diff) | |
| download | rtmux-d4bf4bd7c7702433f713fd31a1f84cb9b189f514.tar.gz rtmux-d4bf4bd7c7702433f713fd31a1f84cb9b189f514.tar.bz2 rtmux-d4bf4bd7c7702433f713fd31a1f84cb9b189f514.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-bind-key.c')
| -rw-r--r-- | cmd-bind-key.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/cmd-bind-key.c b/cmd-bind-key.c index ed2f69d1..2af15d29 100644 --- a/cmd-bind-key.c +++ b/cmd-bind-key.c @@ -44,14 +44,16 @@ const struct cmd_entry cmd_bind_key_entry = { static enum cmd_retval cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item) { - struct args *args = self->args; - key_code key; - const char *tablename; - struct cmd_parse_result *pr; + struct args *args = self->args; + key_code key; + const char *tablename; + struct cmd_parse_result *pr; + char **argv = args->argv; + int argc = args->argc; - key = key_string_lookup_string(args->argv[0]); + key = key_string_lookup_string(argv[0]); if (key == KEYC_NONE || key == KEYC_UNKNOWN) { - cmdq_error(item, "unknown key: %s", args->argv[0]); + cmdq_error(item, "unknown key: %s", argv[0]); return (CMD_RETURN_ERROR); } @@ -62,7 +64,10 @@ cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item) else tablename = "prefix"; - pr = cmd_parse_from_arguments(args->argc - 1, args->argv + 1, NULL); + if (argc == 2) + pr = cmd_parse_from_string(argv[1], NULL); + else + pr = cmd_parse_from_arguments(argc - 1, argv + 1, NULL); switch (pr->status) { case CMD_PARSE_EMPTY: cmdq_error(item, "empty command"); |