diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-09-08 12:01:17 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-09-08 12:01:17 +0100 |
| commit | 3c1f34c20809c33508e4e9f47e0fc585ee55d83f (patch) | |
| tree | 0be04577a763832a64bc077954698bda59d94ac1 /cmd-bind-key.c | |
| parent | 634a2bb647bc77c3679f63da3bf877d252b79b1f (diff) | |
| parent | 1fed7e84a3d65c8fbfbb321b84236ccab7265d46 (diff) | |
| download | rtmux-3c1f34c20809c33508e4e9f47e0fc585ee55d83f.tar.gz rtmux-3c1f34c20809c33508e4e9f47e0fc585ee55d83f.tar.bz2 rtmux-3c1f34c20809c33508e4e9f47e0fc585ee55d83f.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-bind-key.c')
| -rw-r--r-- | cmd-bind-key.c | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/cmd-bind-key.c b/cmd-bind-key.c index dcb56c06..b4e4167c 100644 --- a/cmd-bind-key.c +++ b/cmd-bind-key.c @@ -33,9 +33,9 @@ const struct cmd_entry cmd_bind_key_entry = { .name = "bind-key", .alias = "bind", - .args = { "nrN:T:", 2, -1 }, + .args = { "nrN:T:", 1, -1 }, .usage = "[-nr] [-T key-table] [-N note] key " - "command [arguments]", + "[command [arguments]]", .flags = CMD_AFTERHOOK, .exec = cmd_bind_key_exec @@ -46,7 +46,7 @@ cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = cmd_get_args(self); key_code key; - const char *tablename, *note; + const char *tablename, *note = args_get(args, 'N'); struct cmd_parse_result *pr; char **argv = args->argv; int argc = args->argc, repeat; @@ -65,22 +65,24 @@ cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item) tablename = "prefix"; repeat = args_has(args, 'r'); - 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"); - return (CMD_RETURN_ERROR); - case CMD_PARSE_ERROR: - cmdq_error(item, "%s", pr->error); - free(pr->error); - return (CMD_RETURN_ERROR); - case CMD_PARSE_SUCCESS: - break; - } - note = args_get(args, 'N'); - key_bindings_add(tablename, key, note, repeat, pr->cmdlist); + if (argc != 1) { + 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"); + return (CMD_RETURN_ERROR); + case CMD_PARSE_ERROR: + cmdq_error(item, "%s", pr->error); + free(pr->error); + return (CMD_RETURN_ERROR); + case CMD_PARSE_SUCCESS: + break; + } + key_bindings_add(tablename, key, note, repeat, pr->cmdlist); + } else + key_bindings_add(tablename, key, note, repeat, NULL); return (CMD_RETURN_NORMAL); } |