diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-11-08 23:30:42 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-11-08 23:30:42 +0000 |
| commit | f18b224983af08b160af173730698136ea9b7ce4 (patch) | |
| tree | 16c7a215af9ca1b949509ed64aba45c504ad0b88 | |
| parent | 7d288e7fd81c37205896b1eaa02dd1b2124f02c0 (diff) | |
| download | rtmux-f18b224983af08b160af173730698136ea9b7ce4.tar.gz rtmux-f18b224983af08b160af173730698136ea9b7ce4.tar.bz2 rtmux-f18b224983af08b160af173730698136ea9b7ce4.zip | |
Sync OpenBSD patchset 512:
key_string_lookup_key uses a static buffer, so copy its output into the working
buffer before calling the command print function which can also use it (eg
send-keys).
| -rw-r--r-- | cmd-list-keys.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/cmd-list-keys.c b/cmd-list-keys.c index 4642ae44..68f85fbb 100644 --- a/cmd-list-keys.c +++ b/cmd-list-keys.c @@ -1,4 +1,4 @@ -/* $Id: cmd-list-keys.c,v 1.20 2009-07-28 23:19:06 tcunha Exp $ */ +/* $Id: cmd-list-keys.c,v 1.21 2009-11-08 23:30:42 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -47,7 +47,8 @@ cmd_list_keys_exec(struct cmd *self, struct cmd_ctx *ctx) struct cmd_target_data *data = self->data; struct key_binding *bd; const char *key; - char tmp[BUFSIZ], keytmp[64]; + char tmp[BUFSIZ]; + size_t used; int width, keywidth; if (data->target != NULL) @@ -70,14 +71,15 @@ cmd_list_keys_exec(struct cmd *self, struct cmd_ctx *ctx) key = key_string_lookup_key(bd->key & ~KEYC_PREFIX); if (key == NULL) continue; + if (!(bd->key & KEYC_PREFIX)) + used = xsnprintf(tmp, sizeof tmp, "[%s]: ", key); + else + used = xsnprintf(tmp, sizeof tmp, "%*s: ", width, key); + if (used >= sizeof tmp) + continue; - *tmp = '\0'; - cmd_list_print(bd->cmdlist, tmp, sizeof tmp); - if (!(bd->key & KEYC_PREFIX)) { - xsnprintf(keytmp, sizeof keytmp, "[%s]", key); - key = keytmp; - } - ctx->print(ctx, "%*s: %s", width, key, tmp); + cmd_list_print(bd->cmdlist, tmp + used, (sizeof tmp) - used); + ctx->print(ctx, "%s", tmp); } return (0); |