From 6a2ca34216530c687027cf9e767d2b46c85976e6 Mon Sep 17 00:00:00 2001 From: nicm Date: Fri, 27 Nov 2015 15:06:43 +0000 Subject: Do not set a limit on the length of commands when printing them. --- cmd.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'cmd.c') diff --git a/cmd.c b/cmd.c index 0c20d656..824d9caf 100644 --- a/cmd.c +++ b/cmd.c @@ -384,21 +384,19 @@ usage: return (NULL); } -size_t -cmd_print(struct cmd *cmd, char *buf, size_t len) +char * +cmd_print(struct cmd *cmd) { - size_t off, used; + char *out, *s; - off = xsnprintf(buf, len, "%s ", cmd->entry->name); - if (off + 1 < len) { - used = args_print(cmd->args, buf + off, len - off - 1); - if (used == 0) - off--; - else - off += used; - buf[off] = '\0'; - } - return (off); + s = args_print(cmd->args); + if (*s != '\0') + xasprintf(&out, "%s %s", cmd->entry->name, s); + else + out = xstrdup(cmd->entry->name); + free(s); + + return (out); } /* Adjust current mouse position for a pane. */ -- cgit