From: Kevin McCarthy <kevin@8t8.us>
Date: Fri, 24 Aug 2018 22:49:49 +0000 (-0700)
Subject: Change $query_format to use mutt_format_s
X-Git-Tag: 2019-10-25~671^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3670a4db273a7bd289ab8a130242192a4b658c3;p=neomutt

Change $query_format to use mutt_format_s

Use the character-cell width functions so that multibyte output is
properly formatted.
---

diff --git a/query.c b/query.c
index b6b317aaf..5c2e8045e 100644
--- a/query.c
+++ b/query.c
@@ -258,8 +258,7 @@ static const char *query_format_str(char *buf, size_t buflen, size_t col, int co
   {
     case 'a':
       mutt_addr_write(tmp, sizeof(tmp), query->addr, true);
-      snprintf(fmt, sizeof(fmt), "%%%ss", prec);
-      snprintf(buf, buflen, fmt, tmp);
+      mutt_format_s(buf, buflen, prec, tmp);
       break;
     case 'c':
       snprintf(fmt, sizeof(fmt), "%%%sd", prec);
@@ -267,16 +266,12 @@ static const char *query_format_str(char *buf, size_t buflen, size_t col, int co
       break;
     case 'e':
       if (!optional)
-      {
-        snprintf(fmt, sizeof(fmt), "%%%ss", prec);
-        snprintf(buf, buflen, fmt, NONULL(query->other));
-      }
+        mutt_format_s(buf, buflen, prec, NONULL(query->other));
       else if (!query->other || !*query->other)
         optional = 0;
       break;
     case 'n':
-      snprintf(fmt, sizeof(fmt), "%%%ss", prec);
-      snprintf(buf, buflen, fmt, NONULL(query->name));
+      mutt_format_s(buf, buflen, prec, NONULL(query->name));
       break;
     case 't':
       snprintf(fmt, sizeof(fmt), "%%%sc", prec);