let m_strformat accept NULL formats.

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index 876c69c..f63ad45 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -329,20 +329,21 @@ void mutt_safe_path(char *s, ssize_t l, address_t *a)
 }
 
 ssize_t m_strformat(char *dst, ssize_t dlen, const char *fmt,
-                    format_t *callback, unsigned long data, format_flag flags)
+                    format_t *callback, anytype cdata, format_flag flags)
 {
     ssize_t pos = flags & M_FORMAT_ARROWCURSOR ? 3 : 0;
 
-    if (dlen >= 0)
-        *dst = '\0';
+    m_strpad(dst, dlen, '\0', pos + 1);
+    if (!fmt)
+        return;
 
     while (*fmt) {
         int ch;
 
         if (*fmt == '%') {
-            char ifstring[STRING], elsestring[STRING], prefix[STRING];
+            char ifstr[STRING], elstr[STRING], prefix[STRING];
 
-            *ifstring = *elsestring = *prefix = '\0';
+            *ifstr = *elstr = *prefix = '\0';
 
             if (*++fmt == '%') {
                 pos += m_strputc(dst + pos, dlen - pos, *fmt++);
@@ -375,7 +376,7 @@ ssize_t m_strformat(char *dst, ssize_t dlen, const char *fmt,
 
                 /* eat the `if' part of the string */
                 iflen = strcspn(fmt, "?&");
-                m_strncpy(ifstring, ssizeof(ifstring), fmt, iflen);
+                m_strncpy(ifstr, ssizeof(ifstr), fmt, iflen);
                 fmt  += iflen;
 
                 /* eat the `else' part of the string (optional) */
@@ -383,7 +384,7 @@ ssize_t m_strformat(char *dst, ssize_t dlen, const char *fmt,
                     fmt++;                /* skip the & */
 
                 p = m_strchrnul(fmt, '?');
-                m_strncpy(elsestring, ssizeof(elsestring), fmt, p - fmt);
+                m_strncpy(elstr, ssizeof(elstr), fmt, p - fmt);
                 fmt = p;
 
                 if (!*fmt++)              /* move past the trailing `?' */
@@ -400,7 +401,7 @@ ssize_t m_strformat(char *dst, ssize_t dlen, const char *fmt,
                 ch = *fmt++;            /* pad char */
 
                 if (COLS - SW > col) {
-                    m_strformat(buf, sizeof(buf), fmt, callback, data, flags);
+                    m_strformat(buf, sizeof(buf), fmt, callback, cdata, flags);
                     pos += m_strpad(dst + pos, dlen - pos, ch,
                                     COLS - SW - col - mutt_strwidth(buf));
                     pos += m_strcpy(dst + pos, dlen - pos, buf);
@@ -422,7 +423,7 @@ ssize_t m_strformat(char *dst, ssize_t dlen, const char *fmt,
 
                 /* use callback function to handle this case */
                 fmt = callback(buf, sizeof (buf), ch, fmt, prefix,
-                               ifstring, elsestring, data, flags);
+                               ifstr, elstr, cdata, flags);
 
                 if (lower)
                     m_strtolower(buf);