]> diplodocus.org Git - nmh/blobdiff - sbr/fmt_scan.c
projects / nmh / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
dtimezone(): Explain abs(3) is undefined on INT_MIN.
[nmh] / sbr / fmt_scan.c
diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index ae311621b22e098e70c6219cbb4f1c8ce8829a3a..c75db3ec95fb0c6953dad86efd7d9e259b667e74 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -1,37 +1,32 @@
-
-/*
- * fmt_scan.c -- format string interpretation
+/* fmt_scan.c -- format string interpretation
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  *
  *
- * $Id$
+ * This is the engine that processes the format instructions created by
+ * fmt_compile (found in fmt_compile.c).
  */
 
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
  */
 
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
-#include <zotnet/tws/tws.h>
+#include <h/tws.h>
 #include <h/fmt_compile.h>
 #include <h/fmt_compile.h>
+#include <h/utils.h>
+#include "unquote.h"
 
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
 #endif
-
-#define        NFMTS MAXARGS
-
-extern char *formataddr ();    /* hook for custom address formatting */
-
-#ifdef LBL
-struct msgs *fmt_current_folder; /* current folder (set by main program) */
+#include <time.h>
+#ifdef MULTIBYTE_SUPPORT
+#  include <wctype.h>
+#  include <wchar.h>
 #endif
 
 #endif
 
-extern int fmt_norm;           /* defined in sbr/fmt_def.c = AD_NAME */
-struct mailname fmt_mnull;
+struct mailname fmt_mnull = { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,
+                             NULL, NULL };
 
 /*
  * static prototypes
 
 /*
  * static prototypes
@@ -52,181 +47,267 @@ match (char *str, char *sub)
     int c1, c2;
     char *s1, *s2;
 
     int c1, c2;
     char *s1, *s2;
 
-#ifdef LOCALE
-    while ((c1 = *sub)) {
-       c1 = (isalpha(c1) && isupper(c1)) ? tolower(c1) : c1;
-       while ((c2 = *str++) && c1 != ((isalpha(c2) && isupper(c2)) ? tolower(c2) : c2))
-           ;
-       if (! c2)
-           return 0;
-       s1 = sub + 1; s2 = str;
-       while ((c1 = *s1++) && ((isalpha(c1) && isupper(c1)) ? tolower(c1) : c1) == ((isalpha(c2 =*s2++) && isupper(c2)) ? tolower(c2) : c2))
-           ;
-       if (! c1)
-           return 1;
-    }
-#else
     while ((c1 = *sub)) {
     while ((c1 = *sub)) {
-       while ((c2 = *str++) && (c1 | 040) != (c2 | 040))
+       c1 = tolower((unsigned char)c1);
+       while ((c2 = *str++) && c1 != tolower((unsigned char)c2))
            ;
        if (! c2)
            return 0;
        s1 = sub + 1; s2 = str;
            ;
        if (! c2)
            return 0;
        s1 = sub + 1; s2 = str;
-       while ((c1 = *s1++) && (c1 | 040) == (*s2++ | 040))
+       while ((c1 = *s1++) &&
+            tolower((unsigned char)c1) == tolower((unsigned char)(c2 = *s2++)))
            ;
        if (! c1)
            return 1;
     }
            ;
        if (! c1)
            return 1;
     }
-#endif
     return 1;
 }
 
 /*
     return 1;
 }
 
 /*
- * macros to format data
+ * copy a number to the destination subject to a maximum width
  */
  */
-
-#define PUTDF(cp, num, wid, fill)\
-       if (cp + wid < ep) {\
-           if ((i = (num)) < 0)\
-               i = -(num);\
-           if ((c = (wid)) < 0)\
-               c = -c;\
-           sp = cp + c;\
-           do {\
-               *--sp = (i % 10) + '0';\
-               i /= 10;\
-           } while (i > 0 && sp > cp);\
-           if (i > 0)\
-               *sp = '?';\
-           else if ((num) < 0 && sp > cp)\
-               *--sp = '-';\
-           while (sp > cp)\
-               *--sp = fill;\
-           cp += c;\
-           }
-
-#define PUTD(cp, num)\
-       if (cp < ep) {\
-           if ((i = (num)) == 0)\
-               *cp++ = '0';\
-           else {\
-               if ((i = (num)) < 0) {\
-                   *cp++ = '-';\
-                   i = -(num);\
-                   }\
-               c = 10;\
-               while (c <= i) \
-                   c *= 10;\
-               while (cp < ep && c > 1) {\
-                   c /= 10;\
-                   *cp++ = (i / c) + '0';\
-                   i %= c;\
-                   }\
-               }\
-           }
-
-#ifdef LOCALE
-#define PUTSF(cp, str, wid, fill) {\
-               ljust = 0;\
-               if ((i = (wid)) < 0) {\
-                       i = -i;\
-                       ljust++;\
-               }\
-               if ((sp = (str))) {\
-                       if (ljust) {\
-                               c = strlen(sp);\
-                               if (c > i)\
-                                       sp += c - i;\
-                               else {\
-                                       while( --i >= c && cp < ep)\
-                                               *cp++ = fill;\
-                                       i++;\
-                               }\
-                       } else {\
-                           while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\
-                               sp++;\
-                       }\
-                       while ((c = (unsigned char) *sp++) && --i >= 0 && cp < ep)\
-                               if (isgraph(c)) \
-                                   *cp++ = c;\
-                               else {\
-                                       while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\
-                                               sp++;\
-                                           *cp++ = ' ';\
-                               }\
-               }\
-               if (!ljust)\
-               while( --i >= 0 && cp < ep)\
-                   *cp++ = fill;\
+void
+cpnumber(charstring_t dest, int num, unsigned int wid, char fill, size_t max) {
+    if (wid < (num >= 0 ? max : max-1)) {
+       /* Build up the string representation of num in reverse. */
+       charstring_t rev = charstring_create (0);
+       int i = num >= 0 ? num : -num;
+
+       do {
+           charstring_push_back (rev, i % 10  +  '0');
+           i /= 10;
+       } while (--wid > 0  &&  i > 0);
+       if (i > 0) {
+           /* Overflowed the field (wid). */
+           charstring_push_back (rev, '?');
+       } else if (num < 0  &&  wid > 0) {
+           /* Shouldn't need the wid > 0 check, that's why the condition
+              at the top checks wid < max-1 when num < 0. */
+           --wid;
+           if (fill == ' ') {
+               charstring_push_back (rev, '-');
+           }
        }
        }
+       while (wid-- > 0  &&  fill != 0) {
+           charstring_push_back (rev, fill);
+       }
+       if (num < 0  &&  fill == '0') {
+           charstring_push_back (rev, '-');
+       }
+
+       {
+           /* Output the string in reverse. */
+           size_t b = charstring_bytes (rev);
+           const char *cp = b  ?  &charstring_buffer (rev)[b]  :  NULL;
 
 
-#define PUTS(cp, str) {\
-               if ((sp = (str))) {\
-                   while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\
-                       sp++;\
-                   while((c = (unsigned char) *sp++) && cp < ep)\
-                       if (isgraph(c)) \
-                           *cp++ = c;\
-                       else {\
-                           while ((c = (unsigned char) *sp) && (iscntrl(c) || isspace(c)))\
-                               sp++;\
-                           *cp++ = ' ';\
-                       }\
-               }\
+           for (; b > 0; --b) {
+               charstring_push_back (dest, *--cp);
+           }
        }
 
        }
 
-#else /* LOCALE */
-#define PUTSF(cp, str, wid, fill) {\
-               ljust = 0;\
-               if ((i = (wid)) < 0) {\
-                       i = -i;\
-                       ljust++;\
-               }\
-               if (sp = (str)) {\
-                       if (ljust) {\
-                               c = strlen(sp);\
-                               if (c > i)\
-                                       sp += c - i;\
-                               else {\
-                                       while( --i >= c && cp < ep)\
-                                               *cp++ = fill;\
-                                       i++;\
-                               }\
-                       } else {\
-                   while ((c = *sp) && c <= 32)\
-                       sp++;\
-                       }\
-                       while ((c = *sp++) && --i >= 0 && cp < ep)\
-                               if (c > 32) \
-                           *cp++ = c;\
-                       else {\
-                                       while ((c = *sp) && c <= 32)\
-                               sp++;\
-                           *cp++ = ' ';\
-                       }\
-               }\
-               if (!ljust)\
-               while( --i >= 0 && cp < ep)\
-                   *cp++ = fill;\
-               }
+       charstring_free (rev);
+    }
+}
 
 
-#define PUTS(cp, str) {\
-               if (sp = (str)) {\
-                   while ((c = *sp) && c <= 32)\
-                       sp++;\
-                   while( (c = *sp++) && cp < ep)\
-                       if ( c > 32 ) \
-                           *cp++ = c;\
-                       else {\
-                           while ( (c = *sp) && c <= 32 )\
-                               sp++;\
-                           *cp++ = ' ';\
-                       }\
-               }\
+/*
+ * copy string from str to dest padding with the fill character to a
+ * size of wid characters. if wid is negative, the string is right
+ * aligned no more than max characters are copied
+ */
+void
+cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) {
+    int remaining;     /* remaining output width available */
+    int rjust;
+    struct charstring *trimmed;
+    size_t end;        /* number of input bytes remaining in str */
+#ifdef MULTIBYTE_SUPPORT
+    int char_len;      /* bytes in current character */
+    int w;
+    wchar_t wide_char;
+    char *altstr = NULL;
+#endif
+    char *sp;          /* current position in source string */
+    int prevCtrl = 1;
+
+    /* get alignment */
+    rjust = 0;
+    if ((remaining = wid) < 0) {
+       remaining = -remaining;
+       rjust++;
+    }
+    if (remaining > (int) max) { remaining = max; }
+
+    trimmed = rjust ? charstring_create(remaining) : dest;
+
+    if ((sp = str)) {
+#ifdef MULTIBYTE_SUPPORT
+       if (mbtowc(NULL, NULL, 0)) {} /* reset shift state */
+#endif
+       end = strlen(str);
+       while (*sp && remaining > 0 && end > 0) {
+#ifdef MULTIBYTE_SUPPORT
+           char_len = mbtowc(&wide_char, sp, end);
+
+           /*
+            * See the relevant comments in cpstripped() to explain what's
+            * going on here; we want to handle the case where we get
+            * characters that mbtowc() cannot handle
+            */
+
+           if (char_len < 0) {
+               altstr = "?";
+               char_len = mbtowc(&wide_char, altstr, 1);
+           }
+
+           if (char_len <= 0) {
+               break;
+           }
+
+           w = wcwidth(wide_char);
+
+           /* If w > remaining, w must be positive. */
+           if (w > remaining) {
+               break;
+           }
+
+           end -= char_len;
+
+           if (iswcntrl(wide_char) || iswspace(wide_char)) {
+               sp += char_len;
+#else
+            int c;
+           end--;
+            /* isnctrl(), etc., take an int argument.  Cygwin's ctype.h
+               intentionally warns if they are passed a char. */
+            c = (unsigned char) *sp;
+           if (iscntrl(c) || isspace(c)) {
+               sp++;
+#endif
+               if (!prevCtrl) {
+                    charstring_push_back (trimmed, ' ');
+                   remaining--;
                }
 
                }
 
-#endif /* LOCALE */
+               prevCtrl = 1;
+               continue;
+           }
+           prevCtrl = 0;
+
+#ifdef MULTIBYTE_SUPPORT
+           if (w >= 0 && remaining >= w) {
+                charstring_push_back_chars (trimmed, altstr ? altstr : sp,
+                                           char_len, w);
+               remaining -= w;
+               altstr = NULL;
+           }
+           sp += char_len;
+#else
+            charstring_push_back (trimmed, *sp++);
+           remaining--;
+#endif
+       }
+    }
+
+    while (remaining-- > 0) {
+        charstring_push_back(dest, fill);
+    }
+
+    if (rjust) {
+        charstring_append(dest, trimmed);
+        charstring_free(trimmed);
+    }
+}
+
+static void
+cpstripped (charstring_t dest, size_t max, char *str)
+{
+    int prevCtrl = 1;  /* This is 1 so we strip out leading spaces */
+    int len;
+#ifdef MULTIBYTE_SUPPORT
+    int char_len, w;
+    wchar_t wide_char;
+    char *altstr = NULL;
+#endif /* MULTIBYTE_SUPPORT */
+
+    if (!str) {
+       return;
+    }
+
+    len = strlen(str);
+
+#ifdef MULTIBYTE_SUPPORT
+    if (mbtowc(NULL, NULL, 0)) {}  /* Reset shift state */
+#endif /* MULTIBYTE_SUPPORT */
+
+    /*
+     * Process each character at a time; if we have multibyte support
+     * then deal with that here.
+     */
+
+    while (*str != '\0' && len > 0 && max > 0) {
+#ifdef MULTIBYTE_SUPPORT
+       char_len = mbtowc(&wide_char, str, len);
+
+       /*
+        * If mbrtowc() failed, then we have a character that isn't valid
+        * in the current encoding, or len wasn't enough for the whole
+        * multi-byte rune to be read.  Replace it with a '?'.  We do that by
+        * setting the alstr variable to the value of the replacement string;
+        * altstr is used below when the bytes are copied into the output
+        * buffer.
+        */
+       if (char_len < 0) {
+           altstr = "?";
+           char_len = mbtowc(&wide_char, altstr, 1);
+       }
 
 
+       if (char_len <= 0) {
+           break;
+       }
+
+       len -= char_len;
+
+       if (iswcntrl(wide_char) || iswspace(wide_char)) {
+           str += char_len;
+#else /* MULTIBYTE_SUPPORT */
+       int c = (unsigned char) *str;
+       len--;
+       if (iscntrl(c) || isspace(c)) {
+           str++;
+#endif /* MULTIBYTE_SUPPORT */
+           if (! prevCtrl) {
+               charstring_push_back (dest, ' ');
+               --max;
+           }
+
+           prevCtrl = 1;
+           continue;
+       }
+
+       prevCtrl = 0;
+
+#ifdef MULTIBYTE_SUPPORT
+       w = wcwidth(wide_char);
+       assert(w >= 0);
+       if (max >= (size_t) w) {
+           charstring_push_back_chars (dest, altstr ? altstr : str, char_len, w);
+           max -= w;
+           str += char_len;
+           altstr = NULL;
+       } else {
+           /* Not enough width available for the last character.  Output
+              space(s) to fill. */
+           while (max-- > 0) {
+               charstring_push_back (dest, ' ');
+           }
+           break;
+       }
+#else /* MULTIBYE_SUPPORT */
+       charstring_push_back (dest, *str++);
+        --max;
+#endif /* MULTIBYTE_SUPPORT */
+    }
+}
 
 static char *lmonth[] = { "January",  "February","March",   "April",
                          "May",      "June",    "July",    "August",
 
 static char *lmonth[] = { "January",  "February","March",   "April",
                          "May",      "June",    "July",    "August",
@@ -272,82 +353,201 @@ get_x400_comp (char *mbox, char *key, char *buffer, int buffer_len)
            || !(cp = strchr(mbox += idx + strlen (key), '/')))
        return 0;
 
            || !(cp = strchr(mbox += idx + strlen (key), '/')))
        return 0;
 
-    snprintf (buffer, buffer_len, "%*.*s", cp - mbox, cp - mbox, mbox);
+    snprintf (buffer, buffer_len, "%*.*s", (int)(cp - mbox), (int)(cp - mbox), mbox);
     return 1;
 }
 
 struct format *
     return 1;
 }
 
 struct format *
-fmt_scan (struct format *format, char *scanl, int width, int *dat)
+fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
+         struct fmt_callbacks *callbacks)
 {
 {
-    char *cp, *ep, *sp;
-    char *savestr, *str = NULL;
-    char buffer[BUFSIZ], buffer2[BUFSIZ];
-    int i, c, ljust;
-    int value = 0;
+    char *sp;
+    char *savestr, *str;
+    char buffer[NMH_BUFSIZ], buffer2[NMH_BUFSIZ];
+    int i, c, rjust;
+    int value;
     time_t t;
     time_t t;
+    size_t max;
     struct format *fmt;
     struct comp *comp;
     struct tws *tws;
     struct mailname *mn;
 
     struct format *fmt;
     struct comp *comp;
     struct tws *tws;
     struct mailname *mn;
 
-    cp = scanl;
-    ep = scanl + width - 1;
+    /*
+     * max is the same as width, but unsigned so comparisons
+     * with charstring_chars() won't raise compile warnings.
+     */
+    max = width;
+    savestr = str = NULL;
+    value = 0;
+
+    for (fmt = format; fmt->f_type != FT_DONE; fmt++)
+       switch (fmt->f_type) {
+       case FT_PARSEADDR:
+       case FT_PARSEDATE:
+           fmt->f_comp->c_flags &= ~CF_PARSED;
+           break;
+       case FT_COMP:
+       case FT_COMPF:
+       case FT_LS_COMP:
+       case FT_LS_DECODECOMP:
+           /*
+            * Trim these components of any newlines.
+            *
+            * But don't trim the "body" and "text" components.
+            */
+
+           comp = fmt->f_comp;
+
+           if (! (comp->c_flags & CF_TRIMMED) && comp->c_text &&
+               (i = strlen(comp->c_text)) > 0) {
+               if (comp->c_text[i - 1] == '\n' &&
+                   strcmp(comp->c_name, "body") != 0 &&
+                   strcmp(comp->c_name, "text") != 0)
+                   comp->c_text[i - 1] = '\0';
+               comp->c_flags |= CF_TRIMMED;
+           }
+           break;
+       }
+
     fmt = format;
 
     fmt = format;
 
-    while (cp < ep) {
+    for ( ; charstring_chars (scanlp) < max; ) {
        switch (fmt->f_type) {
 
        case FT_COMP:
        switch (fmt->f_type) {
 
        case FT_COMP:
-           PUTS (cp, fmt->f_comp->c_text);
+           cpstripped (scanlp, max - charstring_chars (scanlp),
+                        fmt->f_comp->c_text);
            break;
        case FT_COMPF:
            break;
        case FT_COMPF:
-           PUTSF (cp, fmt->f_comp->c_text, fmt->f_width, fmt->f_fill);
+           cptrimmed (scanlp, fmt->f_comp->c_text, fmt->f_width,
+                      fmt->f_fill, max - charstring_chars (scanlp));
            break;
 
        case FT_LIT:
            sp = fmt->f_text;
            break;
 
        case FT_LIT:
            sp = fmt->f_text;
-           while( (c = *sp++) && cp < ep)
-               *cp++ = c;
+           while ((c = *sp++) && charstring_chars (scanlp) < max) {
+               charstring_push_back (scanlp, c);
+           }
            break;
        case FT_LITF:
            sp = fmt->f_text;
            break;
        case FT_LITF:
            sp = fmt->f_text;
-           ljust = 0;
+           rjust = 0;
            i = fmt->f_width;
            if (i < 0) {
                i = -i;
            i = fmt->f_width;
            if (i < 0) {
                i = -i;
-               ljust++;                /* XXX should do something with this */
+               rjust++;                /* XXX should do something with this */
+           }
+           while ((c = *sp++) && --i >= 0 && charstring_chars (scanlp) < max) {
+               charstring_push_back (scanlp, c);
+           }
+           while (--i >= 0 && charstring_chars (scanlp) < max) {
+               charstring_push_back (scanlp, fmt->f_fill);
            }
            }
-           while( (c = *sp++) && --i >= 0 && cp < ep)
-               *cp++ = c;
-           while( --i >= 0 && cp < ep)
-               *cp++ = fmt->f_fill;
            break;
 
        case FT_STR:
            break;
 
        case FT_STR:
-           PUTS (cp, str);
+           cpstripped (scanlp, max - charstring_chars (scanlp), str);
            break;
        case FT_STRF:
            break;
        case FT_STRF:
-           PUTSF (cp, str, fmt->f_width, fmt->f_fill);
+           cptrimmed (scanlp, str, fmt->f_width, fmt->f_fill,
+                      max - charstring_chars (scanlp));
+           break;
+       case FT_STRLIT:
+           if (str) {
+               sp = str;
+               while ((c = *sp++) && charstring_chars (scanlp) < max) {
+                   charstring_push_back (scanlp, c);
+               }
+           }
+           break;
+       case FT_STRLITZ:
+           if (str) charstring_push_back_chars (scanlp, str, strlen (str), 0);
            break;
        case FT_STRFW:
            adios (NULL, "internal error (FT_STRFW)");
 
            break;
        case FT_STRFW:
            adios (NULL, "internal error (FT_STRFW)");
 
-       case FT_NUM:
-           PUTD (cp, value);
+       case FT_NUM: {
+           int num = value;
+           unsigned int wid;
+
+            for (wid = num <= 0; num; ++wid, num /= 10) {}
+           cpnumber (scanlp, value, wid, ' ',
+                     max - charstring_chars (scanlp));
+           break;
+        }
+       case FT_LS_KILO:
+       case FT_LS_KIBI:
+           {
+               char *unitcp;
+               unsigned int whole, tenths;
+               unsigned int scale = 0;
+               unsigned int val = (unsigned int)value;
+               char *kibisuff = NULL;
+
+               switch (fmt->f_type) {
+               case FT_LS_KILO: scale = 1000; kibisuff = ""; break;
+               case FT_LS_KIBI: scale = 1024; kibisuff = "i"; break;
+               }
+
+               if (val < scale) {
+                   snprintf(buffer, sizeof(buffer), "%u", val);
+               } else {
+                   /* To prevent divide by 0, found by clang static
+                      analyzer. */
+                   if (scale == 0) { scale = 1; }
+
+                   /* find correct scale for size (Kilo/Mega/Giga/Tera) */
+                   for (unitcp = "KMGT"; val > (scale * scale); val /= scale) {
+                       if (!*++unitcp)
+                           break;
+                   }
+
+                   if (!*unitcp) {
+                       strcpy(buffer, "huge");
+                   } else {
+                       /* val is scale times too big.  we want tenths */
+                       val *= 10;
+
+                       /* round up */
+                       val += (scale - 1);
+                       val /= scale;
+
+                       whole = val / 10;
+                       tenths = val - (whole * 10);
+
+                       if (tenths) {
+                           snprintf(buffer, sizeof(buffer), "%u.%u%c%s",
+                                   whole, tenths, *unitcp, kibisuff);
+                       } else {
+                           snprintf(buffer, sizeof(buffer), "%u%c%s",
+                                   whole, *unitcp, kibisuff);
+                       }
+                   }
+               }
+               str = buffer;
+           }
            break;
        case FT_NUMF:
            break;
        case FT_NUMF:
-           PUTDF (cp, value, fmt->f_width, fmt->f_fill);
+           cpnumber (scanlp, value, fmt->f_width, fmt->f_fill,
+                     max - charstring_chars (scanlp));
            break;
 
        case FT_CHAR:
            break;
 
        case FT_CHAR:
-           *cp++ = fmt->f_char;
+           charstring_push_back (scanlp, fmt->f_char);
            break;
 
        case FT_DONE:
            break;
 
        case FT_DONE:
+           if (callbacks && callbacks->trace_func)
+               callbacks->trace_func(callbacks->trace_context, fmt, value,
+                                     str, charstring_buffer (scanlp));
            goto finished;
 
        case FT_IF_S:
            if (!(value = (str && *str))) {
            goto finished;
 
        case FT_IF_S:
            if (!(value = (str && *str))) {
+               if (callbacks && callbacks->trace_func)
+                   callbacks->trace_func(callbacks->trace_context, fmt, value,
+                                         str, charstring_buffer (scanlp));
                fmt += fmt->f_skip;
                continue;
            }
                fmt += fmt->f_skip;
                continue;
            }
@@ -355,6 +555,9 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 
        case FT_IF_S_NULL:
            if (!(value = (str == NULL || *str == 0))) {
 
        case FT_IF_S_NULL:
            if (!(value = (str == NULL || *str == 0))) {
+               if (callbacks && callbacks->trace_func)
+                   callbacks->trace_func(callbacks->trace_context, fmt, value,
+                                         str, charstring_buffer (scanlp));
                fmt += fmt->f_skip;
                continue;
            }
                fmt += fmt->f_skip;
                continue;
            }
@@ -362,6 +565,9 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 
        case FT_IF_V_EQ:
            if (value != fmt->f_value) {
 
        case FT_IF_V_EQ:
            if (value != fmt->f_value) {
+               if (callbacks && callbacks->trace_func)
+                   callbacks->trace_func(callbacks->trace_context, fmt, value,
+                                         str, charstring_buffer (scanlp));
                fmt += fmt->f_skip;
                continue;
            }
                fmt += fmt->f_skip;
                continue;
            }
@@ -369,6 +575,9 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 
        case FT_IF_V_NE:
            if (value == fmt->f_value) {
 
        case FT_IF_V_NE:
            if (value == fmt->f_value) {
+               if (callbacks && callbacks->trace_func)
+                   callbacks->trace_func(callbacks->trace_context, fmt, value,
+                                         str, charstring_buffer (scanlp));
                fmt += fmt->f_skip;
                continue;
            }
                fmt += fmt->f_skip;
                continue;
            }
@@ -376,6 +585,9 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 
        case FT_IF_V_GT:
            if (value <= fmt->f_value) {
 
        case FT_IF_V_GT:
            if (value <= fmt->f_value) {
+               if (callbacks && callbacks->trace_func)
+                   callbacks->trace_func(callbacks->trace_context, fmt, value,
+                                         str, charstring_buffer (scanlp));
                fmt += fmt->f_skip;
                continue;
            }
                fmt += fmt->f_skip;
                continue;
            }
@@ -383,6 +595,9 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 
        case FT_IF_MATCH:
            if (!(value = (str && match (str, fmt->f_text)))) {
 
        case FT_IF_MATCH:
            if (!(value = (str && match (str, fmt->f_text)))) {
+               if (callbacks && callbacks->trace_func)
+                   callbacks->trace_func(callbacks->trace_context, fmt, value,
+                                         str, charstring_buffer (scanlp));
                fmt += fmt->f_skip;
                continue;
            }
                fmt += fmt->f_skip;
                continue;
            }
@@ -397,6 +612,9 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 
        case FT_IF_AMATCH:
            if (!(value = (str && uprf (str, fmt->f_text)))) {
 
        case FT_IF_AMATCH:
            if (!(value = (str && uprf (str, fmt->f_text)))) {
+               if (callbacks && callbacks->trace_func)
+                   callbacks->trace_func(callbacks->trace_context, fmt, value,
+                                         str, charstring_buffer (scanlp));
                fmt += fmt->f_skip;
                continue;
            }
                fmt += fmt->f_skip;
                continue;
            }
@@ -427,6 +645,9 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
            break;
 
        case FT_GOTO:
            break;
 
        case FT_GOTO:
+           if (callbacks && callbacks->trace_func)
+               callbacks->trace_func(callbacks->trace_context, fmt, value,
+                                     str, charstring_buffer (scanlp));
            fmt += fmt->f_skip;
            continue;
 
            fmt += fmt->f_skip;
            continue;
 
@@ -449,14 +670,14 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
            break;
 
        case FT_LS_DECODECOMP:
            break;
 
        case FT_LS_DECODECOMP:
-           if (decode_rfc2047(fmt->f_comp->c_text, buffer2))
+           if (decode_rfc2047(fmt->f_comp->c_text, buffer2, sizeof(buffer2)))
                str = buffer2;
            else
                str = fmt->f_comp->c_text;
            break;
 
        case FT_LS_DECODE:
                str = buffer2;
            else
                str = fmt->f_comp->c_text;
            break;
 
        case FT_LS_DECODE:
-           if (str && decode_rfc2047(str, buffer2))
+           if (str && decode_rfc2047(str, buffer2, sizeof(buffer2)))
                str = buffer2;
            break;
 
                str = buffer2;
            break;
 
@@ -464,29 +685,31 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
            if (str) {
                    char *xp;
 
            if (str) {
                    char *xp;
 
-                   strncpy(buffer, str, sizeof(buffer));
+                   if (str != buffer)
+                       strncpy(buffer, str, sizeof(buffer));
+                   buffer[sizeof(buffer)-1] = '\0';
                    str = buffer;
                    str = buffer;
-                   while (isspace(*str))
+                   while (isspace((unsigned char) *str))
                            str++;
                            str++;
-                   ljust = 0;
+                   rjust = 0;
                    if ((i = fmt->f_width) < 0) {
                            i = -i;
                    if ((i = fmt->f_width) < 0) {
                            i = -i;
-                           ljust++;
+                           rjust++;
                    }
 
                    }
 
-                   if (!ljust && i > 0 && strlen(str) > i)
+                   if (!rjust && i > 0 && (int) strlen(str) > i)
                            str[i] = '\0';
                    xp = str;
                    xp += strlen(str) - 1;
                            str[i] = '\0';
                    xp = str;
                    xp += strlen(str) - 1;
-                   while (xp > str && isspace(*xp))
+                   while (xp > str && isspace((unsigned char) *xp))
                            *xp-- = '\0';
                            *xp-- = '\0';
-                   if (ljust && i > 0 && strlen(str) > i)
+                   if (rjust && i > 0 && (int) strlen(str) > i)
                        str += strlen(str) - i;
            }
            break;
 
        case FT_LV_COMPFLAG:
                        str += strlen(str) - i;
            }
            break;
 
        case FT_LV_COMPFLAG:
-           value = fmt->f_comp->c_flags;
+           value = (fmt->f_comp->c_flags & CF_TRUE) != 0;
            break;
        case FT_LV_COMP:
            value = (comp = fmt->f_comp)->c_text ? atoi(comp->c_text) : 0;
            break;
        case FT_LV_COMP:
            value = (comp = fmt->f_comp)->c_text ? atoi(comp->c_text) : 0;
@@ -498,10 +721,13 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
            value = dat[fmt->f_value];
            break;
        case FT_LV_STRLEN:
            value = dat[fmt->f_value];
            break;
        case FT_LV_STRLEN:
-           value = strlen(str);
+           if (str != NULL)
+                   value = strlen(str);
+           else
+                   value = 0;
            break;
        case FT_LV_CHAR_LEFT:
            break;
        case FT_LV_CHAR_LEFT:
-           value = width - (cp - scanl);
+           value = max - charstring_bytes (scanlp);
            break;
        case FT_LV_PLUS_L:
            value += fmt->f_value;
            break;
        case FT_LV_PLUS_L:
            value += fmt->f_value;
@@ -509,15 +735,18 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
        case FT_LV_MINUS_L:
            value = fmt->f_value - value;
            break;
        case FT_LV_MINUS_L:
            value = fmt->f_value - value;
            break;
+       case FT_LV_MULTIPLY_L:
+           value *= fmt->f_value;
+           break;
        case FT_LV_DIVIDE_L:
            if (fmt->f_value)
        case FT_LV_DIVIDE_L:
            if (fmt->f_value)
-               value = value / fmt->f_value;
+               value /= fmt->f_value;
            else
                value = 0;
            break;
        case FT_LV_MODULO_L:
            if (fmt->f_value)
            else
                value = 0;
            break;
        case FT_LV_MODULO_L:
            if (fmt->f_value)
-               value = value % fmt->f_value;
+               value %= fmt->f_value;
            else
                value = 0;
            break;
            else
                value = 0;
            break;
@@ -593,14 +822,15 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                default:
                    value = -1; break;
            }
                default:
                    value = -1; break;
            }
+           break;
        case FT_LV_ZONEF:
        case FT_LV_ZONEF:
-           if ((fmt->f_comp->c_tws->tw_flags & TW_SZONE) == TW_SZEXP)
+           if (fmt->f_comp->c_tws->tw_flags & TW_SZEXP)
                    value = 1;
            else
                    value = -1;
            break;
        case FT_LV_DST:
                    value = 1;
            else
                    value = -1;
            break;
        case FT_LV_DST:
-           value = fmt->f_comp->c_tws->tw_flags & TW_DST;
+           value = fmt->f_comp->c_tws->tw_flags & TW_DST ? 1 : 0;
            break;
        case FT_LS_822DATE:
            str = dasctime (fmt->f_comp->c_tws , TW_ZONE);
            break;
        case FT_LS_822DATE:
            str = dasctime (fmt->f_comp->c_tws , TW_ZONE);
@@ -649,7 +879,9 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                goto unfriendly;
            if ((str = mn->m_pers) == NULL) {
                if ((str = mn->m_note)) {
                goto unfriendly;
            if ((str = mn->m_pers) == NULL) {
                if ((str = mn->m_note)) {
-                   strncpy (buffer, str, sizeof(buffer));
+                   if (str != buffer)
+                       strncpy (buffer, str, sizeof(buffer));
+                   buffer[sizeof(buffer)-1] = '\0';
                    str = buffer;
                    if (*str == '(')
                        str++;
                    str = buffer;
                    if (*str == '(')
                        str++;
@@ -664,7 +896,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                    }
                } else if (!(str = get_x400_friendly (mn->m_mbox,
                                buffer, sizeof(buffer)))) {
                    }
                } else if (!(str = get_x400_friendly (mn->m_mbox,
                                buffer, sizeof(buffer)))) {
-       unfriendly: ;
+       unfriendly:
                  switch (mn->m_type) {
                    case LOCALHOST:
                        str = mn->m_mbox;
                  switch (mn->m_type) {
                    case LOCALHOST:
                        str = mn->m_mbox;
@@ -688,6 +920,19 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
            }
            break;
 
            }
            break;
 
+
+               /* UNQUOTEs RFC-2822 quoted-string and quoted-pair */
+       case FT_LS_UNQUOTE:
+           if (str) {          
+               if (str != buffer)
+                   strncpy(buffer, str, sizeof(buffer));
+               /* strncpy doesn't NUL-terminate if it fills the buffer */
+               buffer[sizeof(buffer)-1] = '\0';
+               unquote_string(buffer, buffer2);
+               str = buffer2;
+            }
+           break;
+
        case FT_LOCALDATE:
            comp = fmt->f_comp;
            if ((t = comp->c_tws->tw_clock) == 0)
        case FT_LOCALDATE:
            comp = fmt->f_comp;
            if ((t = comp->c_tws->tw_clock) == 0)
@@ -706,18 +951,32 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 
        case FT_PARSEDATE:
            comp = fmt->f_comp;
 
        case FT_PARSEDATE:
            comp = fmt->f_comp;
+           if (comp->c_flags & CF_PARSED)
+               break;
            if ((sp = comp->c_text) && (tws = dparsetime(sp))) {
                *comp->c_tws = *tws;
            if ((sp = comp->c_text) && (tws = dparsetime(sp))) {
                *comp->c_tws = *tws;
-               comp->c_flags = 0;
-           } else if (comp->c_flags >= 0) {
-               memset ((char *) comp->c_tws, 0, sizeof *comp->c_tws);
-               comp->c_flags = 1;
+               comp->c_flags &= ~CF_TRUE;
+           } else if ((comp->c_flags & CF_DATEFAB) == 0) {
+               memset (comp->c_tws, 0, sizeof *comp->c_tws);
+               comp->c_flags = CF_TRUE;
            }
            }
+           comp->c_flags |= CF_PARSED;
            break;
 
        case FT_FORMATADDR:
            /* hook for custom address list formatting (see replsbr.c) */
            break;
 
        case FT_FORMATADDR:
            /* hook for custom address list formatting (see replsbr.c) */
-           str = formataddr (savestr, str);
+           if (callbacks && callbacks->formataddr)
+               str = callbacks->formataddr (savestr, str);
+           else
+               str = formataddr (savestr, str);
+           break;
+
+       case FT_CONCATADDR:
+           /* The same as formataddr, but doesn't do duplicate suppression */
+           if (callbacks && callbacks->concataddr)
+               str = callbacks->concataddr (savestr, str);
+           else
+               str = concataddr (savestr, str);
            break;
 
        case FT_PUTADDR:
            break;
 
        case FT_PUTADDR:
@@ -733,66 +992,78 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 
            lp = str;
            wid = value;
 
            lp = str;
            wid = value;
-           len = strlen (str);
+           len = str ? strlen (str) : 0;
            sp = fmt->f_text;
            indent = strlen (sp);
            wid -= indent;
            sp = fmt->f_text;
            indent = strlen (sp);
            wid -= indent;
-           while( (c = *sp++) && cp < ep)
-               *cp++ = c;
+           if (wid <= 0) {
+               adios(NULL, "putaddr -- num register (%d) must be greater "
+                           "than label width (%d)", value, indent);
+           }
+           while ((c = *sp++) && charstring_chars (scanlp) < max) {
+               charstring_push_back (scanlp, c);
+           }
            while (len > wid) {
                /* try to break at a comma; failing that, break at a
                 * space.
                 */
                lastb = 0; sp = lp + wid;
            while (len > wid) {
                /* try to break at a comma; failing that, break at a
                 * space.
                 */
                lastb = 0; sp = lp + wid;
-               while (sp > lp && (c = *--sp) != ',') {
+               while (sp > lp && (c = (unsigned char) *--sp) != ',') {
                    if (! lastb && isspace(c))
                        lastb = sp - 1;
                }
                if (sp == lp) {
                    if (! (sp = lastb)) {
                        sp = lp + wid - 1;
                    if (! lastb && isspace(c))
                        lastb = sp - 1;
                }
                if (sp == lp) {
                    if (! (sp = lastb)) {
                        sp = lp + wid - 1;
-                       while (*sp && *sp != ',' && !isspace(*sp))
+                       while (*sp && *sp != ',' &&
+                                               !isspace((unsigned char) *sp))
                            sp++;
                        if (*sp != ',')
                            sp--;
                    }
                }
                len -= sp - lp + 1;
                            sp++;
                        if (*sp != ',')
                            sp--;
                    }
                }
                len -= sp - lp + 1;
-               while (cp < ep && lp <= sp)
-                   *cp++ = *lp++;
-               *cp++ = '\n';
-               for (i=indent; cp < ep && i > 0; i--)
-                   *cp++ = ' ';
-               while (isspace(*lp))
+               while (lp <= sp && charstring_chars (scanlp) < max) {
+                   charstring_push_back (scanlp, *lp++);
+               }
+               while (isspace((unsigned char) *lp))
                    lp++, len--;
                if (*lp) {
                    lp++, len--;
                if (*lp) {
-                   if (cp < ep)
-                       *cp++ = '\n';
-                   for (i=indent; cp < ep && i > 0; i--)
-                       *cp++ = ' ';
+                   if (charstring_chars (scanlp) < max) {
+                       charstring_push_back (scanlp, '\n');
+                    }
+                   for (i=indent;
+                        charstring_chars (scanlp) < max && i > 0;
+                        i--)
+                       charstring_push_back (scanlp, ' ');
                }
            }
                }
            }
-           PUTS (cp, lp);
+           cpstripped (scanlp, max - charstring_chars (scanlp), lp);
            }
            break;
 
        case FT_PARSEADDR:
            comp = fmt->f_comp;
            }
            break;
 
        case FT_PARSEADDR:
            comp = fmt->f_comp;
+           if (comp->c_flags & CF_PARSED)
+               break;
            if (comp->c_mn != &fmt_mnull)
                mnfree (comp->c_mn);
            if ((sp = comp->c_text) && (sp = getname(sp)) &&
            if (comp->c_mn != &fmt_mnull)
                mnfree (comp->c_mn);
            if ((sp = comp->c_text) && (sp = getname(sp)) &&
-               (mn = getm (sp, NULL, 0, fmt_norm, NULL))) {
+               (mn = getm (sp, NULL, 0, NULL, 0))) {
                comp->c_mn = mn;
                while (getname(""))
                    ;
                comp->c_mn = mn;
                while (getname(""))
                    ;
+               comp->c_flags |= CF_PARSED;
            } else {
                while (getname(""))             /* XXX */
                    ;
                comp->c_mn = &fmt_mnull;
            }
            break;
            } else {
                while (getname(""))             /* XXX */
                    ;
                comp->c_mn = &fmt_mnull;
            }
            break;
-           
+
        case FT_MYMBOX:
        case FT_MYMBOX:
+       case FT_GETMYMBOX:
+       case FT_GETMYADDR:
            /*
             * if there's no component, we say true.  Otherwise we
             * say "true" only if we can parse the address and it
            /*
             * if there's no component, we say true.  Otherwise we
             * say "true" only if we can parse the address and it
@@ -802,49 +1073,106 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
            if (comp->c_mn != &fmt_mnull)
                mnfree (comp->c_mn);
            if ((sp = comp->c_text) && (sp = getname(sp)) &&
            if (comp->c_mn != &fmt_mnull)
                mnfree (comp->c_mn);
            if ((sp = comp->c_text) && (sp = getname(sp)) &&
-               (mn = getm (sp, NULL, 0, AD_NAME, NULL))) {
+               (mn = getm (sp, NULL, 0, NULL, 0))) {
                comp->c_mn = mn;
                comp->c_mn = mn;
-               comp->c_flags = ismymbox(mn);
+               if (ismymbox(mn)) {
+                   comp->c_flags |= CF_TRUE;
+                   /* Set str for use with FT_GETMYMBOX.  With
+                      FT_GETMYADDR, comp->c_mn will be run through
+                      FT_LS_ADDR, which will strip off any pers
+                      name. */
+                   str = mn->m_text;
+               } else {
+                   comp->c_flags &= ~CF_TRUE;
+               }
                while ((sp = getname(sp)))
                while ((sp = getname(sp)))
-                   if (comp->c_flags == 0 &&
-                       (mn = getm (sp, NULL, 0, AD_NAME, NULL)))
-                       comp->c_flags |= ismymbox(mn);
+                   if ((comp->c_flags & CF_TRUE) == 0 &&
+                       (mn = getm (sp, NULL, 0, NULL, 0)))
+                       if (ismymbox(mn)) {
+                           comp->c_flags |= CF_TRUE;
+                           /* Set str and comp->c_text for use with
+                              FT_GETMYMBOX.  With FT_GETMYADDR,
+                              comp->c_mn will be run through
+                              FT_LS_ADDR, which will strip off any
+                              pers name. */
+                           free (comp->c_text);
+                           comp->c_text = str = strdup (mn->m_text);
+                           comp->c_mn = mn;
+                       }
+               comp->c_flags |= CF_PARSED;
            } else {
                while (getname(""))             /* XXX */
                    ;
            } else {
                while (getname(""))             /* XXX */
                    ;
-               comp->c_flags = (comp->c_text == 0);
+               if (comp->c_text == 0)
+                   comp->c_flags |= CF_TRUE;
+               else {
+                   comp->c_flags &= ~CF_TRUE;
+               }
                comp->c_mn = &fmt_mnull;
            }
                comp->c_mn = &fmt_mnull;
            }
-           break;
-
-       case FT_ADDTOSEQ:
-#ifdef LBL
-           /* If we're working on a folder (as opposed to a file), add the
-            * current msg to sequence given in literal field.  Don't
-            * disturb string or value registers.
-            */
-           if (fmt_current_folder)
-                   seq_addmsg(fmt_current_folder, fmt->f_text, dat[0], -1);
-#endif
+           if ((comp->c_flags & CF_TRUE) == 0  &&
+               (fmt->f_type == FT_GETMYMBOX || fmt->f_type == FT_GETMYADDR)) {
+               /* Fool FT_LS_ADDR into not producing an address. */
+               comp->c_mn = &fmt_mnull; comp->c_text = NULL;
+           }
            break;
        }
            break;
        }
+
+       /*
+        * Call our tracing callback function, if one was supplied
+        */
+
+       if (callbacks && callbacks->trace_func)
+           callbacks->trace_func(callbacks->trace_context, fmt, value,
+                                 str, charstring_buffer (scanlp));
        fmt++;
     }
        fmt++;
     }
-#ifndef JLR
-    finished:;
-    if (cp[-1] != '\n')
-       *cp++ = '\n';
-    *cp   = 0;
-    return ((struct format *)0);
-#else /* JLR */
-    if (cp[-1] != '\n')
-       *cp++ = '\n';
-    while (fmt->f_type != FT_DONE)
+
+    /* Emit any trailing sequences of zero display length. */
+    while (fmt->f_type != FT_DONE) {
+       if (fmt->f_type == FT_LS_LIT) {
+           str = fmt->f_text;
+           if (callbacks && callbacks->trace_func)
+               callbacks->trace_func(callbacks->trace_context, fmt, value,
+                                     str, charstring_buffer (scanlp));
+       } else if (fmt->f_type == FT_STRLITZ) {
+           /* Don't want to emit part of an escape sequence.  So if
+              there isn't enough room in the buffer for the entire
+              string, skip it completely.  Need room for null
+              terminator, and maybe trailing newline (added below). */
+           if (str) {
+               for (sp = str; *sp; ++sp) {
+                   charstring_push_back (scanlp, *sp);
+               }
+           }
+           if (callbacks && callbacks->trace_func)
+               callbacks->trace_func(callbacks->trace_context, fmt, value,
+                                     str, charstring_buffer (scanlp));
+       }
        fmt++;
        fmt++;
+    }
 
 
-    finished:;    
-    *cp = '\0';
-    return (fmt->f_value ? ++fmt : (struct format *) 0);
+    finished:
+    if (charstring_bytes (scanlp) > 0) {
+       /*
+        * Append a newline if the last character wasn't.
+        */
+#ifdef MULTIBYTE_SUPPORT
+       /*
+        * It's a little tricky because the last byte might be part of
+        * a multibyte character, in which case we assume that wasn't
+        * a newline.
+        */
+       size_t last_char_len = charstring_last_char_len (scanlp);
+#else  /* ! MULTIBYTE_SUPPORT */
+       size_t last_char_len = 1;
+#endif /* ! MULTIBYTE_SUPPORT */
+
+       if (last_char_len > 1  ||
+           charstring_buffer (scanlp)[charstring_bytes (scanlp) - 1] != '\n') {
+           charstring_push_back (scanlp, '\n');
+       }
+    }
 
 
-#endif /* JLR */
+    return (NULL);
 }
 }
Fork of https://git.savannah.nongnu.org/cgit/nmh.git