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 8b81924b8ca22e176e2b433aaec512b4589ea8a1..e18e2cd5c6d51ec07059506673ff93b985ec2943 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -491,7 +491,8 @@ 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 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;
     char *maildir, *cp, name[NAMESZ], rbuf[BUFSIZ];
     struct msgs *mp;
     struct comp *c;


@@ -534,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++)
            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)
                
            num_unseen_seq = i;
            if (dp)


@@ -576,7 +577,7 @@ process_messages(struct format *fmt, struct msgs_array *comps,
 
            dat[4] = 0;
            for (i = 0; i < num_unseen_seq; i++) {
 
            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;
                }
                    dat[4] = 1;
                    break;
                }


@@ -646,6 +647,7 @@ finished:
        }
     }
 
        }
     }
 

+    ivector_free (seqnum);

     folder_free(mp);
     return;
 }
     folder_free(mp);
     return;
 }


@@ -1301,8 +1303,10 @@ insert (struct mailname *np)
        return 0;
 
     for (mp = &mq; mp->m_next; mp = mp->m_next) {
        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))
            return 0;
     }
     if (!ccme && ismymbox (np))