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: mutt-1-11-rel~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c041375c67b8b41dd21419962a16bac94fbac9ff;p=mutt

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 df141b1d..b49bff29 100644
--- a/query.c
+++ b/query.c
@@ -199,8 +199,7 @@ static const char * query_format_str (char *dest, size_t destlen, size_t col, in
   {
   case 'a':
     rfc822_write_address (buf2, sizeof (buf2), query->addr, 1);
-    snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
-    snprintf (dest, destlen, tmp, buf2);
+    mutt_format_s (dest, destlen, fmt, buf2);
     break;
   case 'c':
     snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
@@ -208,16 +207,12 @@ static const char * query_format_str (char *dest, size_t destlen, size_t col, in
     break;
   case 'e':
     if (!optional)
-    {
-      snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
-      snprintf (dest, destlen, tmp, NONULL (query->other));
-    }
+      mutt_format_s (dest, destlen, fmt, NONULL (query->other));
     else if (!query->other || !*query->other)
       optional = 0;
     break;
   case 'n':
-    snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
-    snprintf (dest, destlen, tmp, NONULL (query->name));
+    mutt_format_s (dest, destlen, fmt, NONULL (query->name));
     break;
   case 't':
     snprintf (tmp, sizeof (tmp), "%%%sc", fmt);