diff options
author | nicm <nicm> | 2019-10-03 10:39:08 +0000 |
---|---|---|
committer | nicm <nicm> | 2019-10-03 10:39:08 +0000 |
commit | 02253d1e5c881be95fd2fc37b4c4209640b6b266 (patch) | |
tree | 4b92523bf633446725b5a5e8a9558eff6a19fd34 | |
parent | f4c7141f5d2abd06bb90443ad9edc7c1a985eb40 (diff) |
Use a malloc'd buffer for lsk since commands can be very long, from Gregory Pakosz.
-rw-r--r-- | cmd-list-keys.c | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/cmd-list-keys.c b/cmd-list-keys.c index ef862101..5113999d 100644 --- a/cmd-list-keys.c +++ b/cmd-list-keys.c @@ -61,8 +61,9 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item) struct key_table *table; struct key_binding *bd; const char *tablename, *r; - char *key, *cp, tmp[8192]; + char *key, *cp, *tmp; int repeat, width, tablewidth, keywidth; + size_t tmpsize, tmpused, cplen; if (self->entry == &cmd_list_commands_entry) return (cmd_list_keys_commands(self, item)); @@ -101,6 +102,9 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item) table = key_bindings_next_table(table); } + tmpsize = 256; + tmp = xmalloc(tmpsize); + table = key_bindings_first_table (); while (table != NULL) { if (tablename != NULL && strcmp(table->name, tablename) != 0) { @@ -117,20 +121,35 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item) r = "-r "; else r = " "; - xsnprintf(tmp, sizeof tmp, "%s-T ", r); + tmpused = xsnprintf(tmp, tmpsize, "%s-T ", r); cp = utf8_padcstr(table->name, tablewidth); - strlcat(tmp, cp, sizeof tmp); - strlcat(tmp, " ", sizeof tmp); + cplen = strlen(cp) + 1; + while (tmpused + cplen + 1>= tmpsize) { + tmpsize *= 2; + tmp = xrealloc(tmp, tmpsize); + } + tmpused = strlcat(tmp, cp, tmpsize); + tmpused = strlcat(tmp, " ", tmpsize); free(cp); cp = utf8_padcstr(key, keywidth); - strlcat(tmp, cp, sizeof tmp); - strlcat(tmp, " ", sizeof tmp); + cplen = strlen(cp) + 1; + while (tmpused + cplen + 1 >= tmpsize) { + tmpsize *= 2; + tmp = xrealloc(tmp, tmpsize); + } + tmpused = strlcat(tmp, cp, tmpsize); + tmpused = strlcat(tmp, " ", tmpsize); free(cp); cp = cmd_list_print(bd->cmdlist, 1); - strlcat(tmp, cp, sizeof tmp); + cplen = strlen(cp); + while (tmpused + cplen + 1 >= tmpsize) { + tmpsize *= 2; + tmp = xrealloc(tmp, tmpsize); + } + strlcat(tmp, cp, tmpsize); free(cp); cmdq_print(item, "bind-key %s", tmp); @@ -141,6 +160,8 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item) table = key_bindings_next_table(table); } + free(tmp); + return (CMD_RETURN_NORMAL); } |