Changeset 5137:0c47f7b06158 for muttlib.c

Timestamp:

2007-04-11 22:36:24 (21 months ago)

Author:

Michael Elkins <me@…>

Branch:

HEAD

Message:

Pass column value recursively when expanding format strings (bug #2840).

Files:

• muttlib.c (modified) (8 diffs)

muttlib.c

@@ -992 +992 @@
 void mutt_FormatString (char *dest,             /* output buffer */
                         size_t destlen,         /* output buffer len */
+                        size_t col,             /* starting column (nonzero when called recursively) */
                         const char *src,        /* template string */
                         format_t *callback,     /* callback for processing */
@@ -999 +1000 @@
   char prefix[SHORT_STRING], buf[LONG_STRING], *cp, *wptr = dest, ch;
   char ifstring[SHORT_STRING], elsestring[SHORT_STRING];
-  size_t wlen, count, len, col, wid;
+  size_t wlen, count, len, wid;
   pid_t pid;
   FILE *filter;
@@ -1008 +1009 @@
   destlen--; /* save room for the terminal \0 */
   wlen = (flags & M_FORMAT_ARROWCURSOR && option (OPTARROWCURSOR)) ? 3 : 0;
-  col = wlen;
+  col += wlen;
 
   if ((flags & M_FORMAT_NOFILTER) == 0)
@@ -1056 +1057 @@
         dprint(3, (debugfile, "fmtpipe %2d: %s\n", i++, word->data));
         mutt_buffer_addch(command, '\'');
-        mutt_FormatString(buf, sizeof(buf), word->data, callback, data,
+        mutt_FormatString(buf, sizeof(buf), 0, word->data, callback, data,
                           flags | M_FORMAT_NOFILTER);
         for (p = buf; p && *p; p++)
@@ -1075 +1076 @@
       dprint(3, (debugfile, "fmtpipe > %s\n", command->data));
 
+      col -= wlen;      /* reset to passed in value */
       wptr = dest;      /* reset write ptr */
       wlen = (flags & M_FORMAT_ARROWCURSOR && option (OPTARROWCURSOR)) ? 3 : 0;
@@ -1101 +1103 @@
             if (recycler)
             {
-              mutt_FormatString(dest, destlen++, recycler, callback, data, flags);
+              mutt_FormatString(dest, destlen++, col, recycler, callback, data, flags);
               FREE(&recycler);
             }
@@ -1204 +1206 @@
         {
           count -= col; /* how many columns left on this line */
-          mutt_FormatString (buf, sizeof (buf), src, callback, data, flags);
+          mutt_FormatString (buf, sizeof (buf), 0, src, callback, data, flags);
           len = mutt_strlen (buf);
           wid = mutt_strwidth (buf);
@@ -1254 +1256 @@
         
         /* use callback function to handle this case */
-        src = callback (buf, sizeof (buf), ch, src, prefix, ifstring, elsestring, data, flags);
+        src = callback (buf, sizeof (buf), col, ch, src, prefix, ifstring, elsestring, data, flags);
 
         if (tolower)