Look at post instead of inc to determine build options in build_nmh.

[nmh] / uip / fmttest.c

diff --git a/uip/fmttest.c b/uip/fmttest.c
index bdcf2d3cd48e1b7d42a2731aeb988c35cc584aca..e18e2cd5c6d51ec07059506673ff93b985ec2943 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -491,11 +491,14 @@ process_messages(struct format *fmt, struct msgs_array *comps,
                 int bufsize, int outwidth, int *dat, struct fmt_callbacks *cb)
 {
     int i, state, msgnum, msgsize = dat[2], num = dat[0], cur = dat[1];
-    int num_unseen_seq = 0, seqnum[NUMATTRS];
+    int num_unseen_seq = 0;
+    ivector_t seqnum = ivector_create (0);
     char *maildir, *cp, name[NAMESZ], rbuf[BUFSIZ];
     struct msgs *mp;
     struct comp *c;
     FILE *in;
+    m_getfld_state_t gstate = 0;
+    int bufsz;
 
     if (! folder)
        folder = getfolder(1);
@@ -505,7 +508,7 @@ process_messages(struct format *fmt, struct msgs_array *comps,
     if (chdir(maildir) < 0)
        adios(maildir, "unable to change directory to");
 
-    if (!(mp = folder_read(folder)))
+    if (!(mp = folder_read(folder, 1)))
        adios(NULL, "unable to read folder %s", folder);
 
     if (mp->nummsg == 0)
@@ -532,7 +535,7 @@ process_messages(struct format *fmt, struct msgs_array *comps,
            dp = getcpy(cp);
            ap = brkstring(dp, " ", "\n");
            for (i = 0; ap && *ap; i++, ap++)
-               seqnum[i] = seq_getnum(mp, *ap);
+               ivector_push_back (seqnum, seq_getnum(mp, *ap));
                
            num_unseen_seq = i;
            if (dp)
@@ -574,7 +577,7 @@ process_messages(struct format *fmt, struct msgs_array *comps,
 
            dat[4] = 0;
            for (i = 0; i < num_unseen_seq; i++) {
-               if (in_sequence(mp, seqnum[i], msgnum)) {
+               if (in_sequence(mp, ivector_at (seqnum, i), msgnum)) {
                    dat[4] = 1;
                    break;
                }
@@ -585,29 +588,33 @@ process_messages(struct format *fmt, struct msgs_array *comps,
             */
 
            for (state = FLD;;) {
-               state = m_getfld(state, name, rbuf, sizeof(rbuf), in);
+               bufsz = sizeof(rbuf);
+               state = m_getfld(&gstate, name, rbuf, &bufsz, in);
                switch (state) {
                case FLD:
                case FLDPLUS:
                    i = fmt_addcomptext(name, rbuf);
                    if (i != -1) {
                        while (state == FLDPLUS) {
-                           state = m_getfld(state, name, rbuf,
-                                            sizeof(rbuf), in);
+                           bufsz = sizeof(rbuf);
+                           state = m_getfld(&gstate, name, rbuf, &bufsz, in);
                            fmt_appendcomp(i, name, rbuf);
                        }
                    }
 
-                   while (state == FLDPLUS)
-                       state = m_getfld(state, name, rbuf,
-                                        sizeof(rbuf), in);
+                   while (state == FLDPLUS) {
+                       bufsz = sizeof(rbuf);
+                       state = m_getfld(&gstate, name, rbuf, &bufsz, in);
+                   }
                    break;
 
                case BODY:
                    if (fmt_findcomp("body")) {
-                       if ((i = strlen(rbuf)) < outwidth)
-                           state = m_getfld(state, name, rbuf + i,
-                                            outwidth - 1, in);
+                       if ((i = strlen(rbuf)) < outwidth) {
+                           bufsz = outwidth - 1;
+                           state = m_getfld(&gstate, name, rbuf + i,
+                                            &bufsz, in);
+                       }
 
                        fmt_addcomptext("body", rbuf);
                    }
@@ -619,6 +626,7 @@ process_messages(struct format *fmt, struct msgs_array *comps,
            }
 finished:
            fclose(in);
+           m_getfld_state_destroy(&gstate);
 
            /*
             * Do this now to override any components in the original message
@@ -639,6 +647,7 @@ finished:
        }
     }
 
+    ivector_free (seqnum);
     folder_free(mp);
     return;
 }
@@ -1033,6 +1042,7 @@ f_typestr(int t)
        case FT_LS_FRIENDLY: return("LS_FRIENDLY");
        case FT_LV_HOSTTYPE: return("LV_HOSTTYPE");
        case FT_LV_INGRPF: return("LV_INGRPF");
+       case FT_LS_UNQUOTE: return("LS_UNQUOTE");
        case FT_LV_NOHOSTF: return("LV_NOHOSTF");
        case FT_LOCALDATE: return("LOCALDATE");
        case FT_GMTDATE: return("GMTDATE");
@@ -1066,7 +1076,7 @@ f_typestr(int t)
        case FT_V_MATCH: return("V_MATCH");
        case FT_V_AMATCH: return("V_AMATCH");
        default:
-               printf(buf, "/* ??? #%d */", t);
+               snprintf(buf, sizeof(buf), "/* ??? #%d */", t);
                return(buf);
        }
 }
@@ -1293,8 +1303,10 @@ insert (struct mailname *np)
        return 0;
 
     for (mp = &mq; mp->m_next; mp = mp->m_next) {
-       if (!mh_strcasecmp (np->m_host, mp->m_next->m_host)
-               && !mh_strcasecmp (np->m_mbox, mp->m_next->m_mbox))
+       if (!strcasecmp (np->m_host ? np->m_host : "",
+                        mp->m_next->m_host ? mp->m_next->m_host : "") &&
+           !strcasecmp (np->m_mbox ? np->m_mbox : "",
+                        mp->m_next->m_mbox ? mp->m_next->m_mbox : ""))
            return 0;
     }
     if (!ccme && ismymbox (np))