diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2010-06-26 18:20:53 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2010-06-26 18:20:53 +0000 |
| commit | 42e24139788d76f00896005df0f745d9e022709a (patch) | |
| tree | ccc08279c4c2f4162b42b07112ae3fe340c81358 /cmd-bind-key.c | |
| parent | ef7293379f00b85cb96dd0dff128bb503e87612b (diff) | |
| download | rtmux-42e24139788d76f00896005df0f745d9e022709a.tar.gz rtmux-42e24139788d76f00896005df0f745d9e022709a.tar.bz2 rtmux-42e24139788d76f00896005df0f745d9e022709a.zip | |
Setting the cmdlist pointer in the bind-key to NULL to prevent it being freed
after the command is executing is bogus because it may still be needed if the
same command is going to be executed again (for example if you "bind-key a
bind-key b ..."). Making a copy is hard, so instead add a reference count to
the cmd_list.
While here, also print bind-key -n and the rest of the flags properly.
Fixes problem reported by mcbride@.
Diffstat (limited to 'cmd-bind-key.c')
| -rw-r--r-- | cmd-bind-key.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/cmd-bind-key.c b/cmd-bind-key.c index c535612f..60887904 100644 --- a/cmd-bind-key.c +++ b/cmd-bind-key.c @@ -130,7 +130,7 @@ cmd_bind_key_exec(struct cmd *self, unused struct cmd_ctx *ctx) return (cmd_bind_key_table(self, ctx)); key_bindings_add(data->key, data->can_repeat, data->cmdlist); - data->cmdlist = NULL; /* avoid free */ + data->cmdlist->references++; return (0); } @@ -192,8 +192,17 @@ cmd_bind_key_print(struct cmd *self, char *buf, size_t len) off += xsnprintf(buf, len, "%s", self->entry->name); if (data == NULL) return (off); + + if (off < len && data->command_key) + off += xsnprintf(buf + off, len - off, " -c"); + if (off < len && !(data->key & KEYC_PREFIX)) + off += xsnprintf(buf + off, len - off, " -n"); + if (off < len && data->can_repeat) + off += xsnprintf(buf + off, len - off, " -r"); + if (off < len && data->tablename != NULL) + off += cmd_prarg(buf + off, len - off, " -t ", data->tablename); if (off < len) { - skey = key_string_lookup_key(data->key); + skey = key_string_lookup_key(data->key & ~KEYC_PREFIX); off += xsnprintf(buf + off, len - off, " %s ", skey); } if (off < len) |