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 f48d1cbef9581d2b2a5d53f9822c9053949096e3..e18e2cd5c6d51ec07059506673ff93b985ec2943 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -17,19 +17,17 @@
 #define FMTTEST_SWITCHES \
     X("form formatfile", 0, FORMSW) \
     X("format string", 5, FMTSW) \
 #define FMTTEST_SWITCHES \
     X("form formatfile", 0, FORMSW) \
     X("format string", 5, FMTSW) \

-    X("dump", 0, DUMPSW) \

     X("address", 0, ADDRSW) \
     X("raw", 0, RAWSW) \
     X("date", 0, DATESW) \
     X("message", 0, MESSAGESW) \
     X("address", 0, ADDRSW) \
     X("raw", 0, RAWSW) \
     X("date", 0, DATESW) \
     X("message", 0, MESSAGESW) \

+    X("-component-name component-text", 0, OTHERSW) \

     X("dupaddrs", 0, DUPADDRSW) \
     X("nodupaddrs", 0, NDUPADDRSW) \
     X("ccme", 0, CCMESW) \
     X("noccme", 0, NCCMESW) \
     X("normalize", 0, NORMSW) \
     X("nonormalize", 0, NNORMSW) \
     X("dupaddrs", 0, DUPADDRSW) \
     X("nodupaddrs", 0, NDUPADDRSW) \
     X("ccme", 0, CCMESW) \
     X("noccme", 0, NCCMESW) \
     X("normalize", 0, NORMSW) \
     X("nonormalize", 0, NNORMSW) \

-    X("trace", 0, TRACESW) \
-    X("notrace", 0, NTRACESW) \

     X("outsize size-in-characters", 0, OUTSIZESW) \
     X("bufsize size-in-bytes", 0, BUFSZSW) \
     X("width column-width", 0, WIDTHSW) \
     X("outsize size-in-characters", 0, OUTSIZESW) \
     X("bufsize size-in-bytes", 0, BUFSZSW) \
     X("width column-width", 0, WIDTHSW) \


@@ -37,8 +35,11 @@
     X("msgcur flag", 0, MSGCURSW) \
     X("msgsize size", 0, MSGSIZESW) \
     X("unseen flag", 0, UNSEENSW) \
     X("msgcur flag", 0, MSGCURSW) \
     X("msgsize size", 0, MSGSIZESW) \
     X("unseen flag", 0, UNSEENSW) \

+    X("dump", 0, DUMPSW) \
+    X("nodump", 0, NDUMPSW) \
+    X("trace", 0, TRACESW) \
+    X("notrace", 0, NTRACESW) \

     X("version", 0, VERSIONSW) \
     X("version", 0, VERSIONSW) \

-    X("-component-name component-text", 0, OTHERSW) \

     X("help", 0, HELPSW) \
 
 #define X(sw, minchars, id) id,
     X("help", 0, HELPSW) \
 
 #define X(sw, minchars, id) id,


@@ -264,6 +265,9 @@ main (int argc, char **argv)
                case DUMPSW:
                    dump++;
                    continue;
                case DUMPSW:
                    dump++;
                    continue;

+               case NDUMPSW:
+                   dump = 0;
+                   continue;

 
            }
        }
 
            }
        }


@@ -296,6 +300,16 @@ main (int argc, char **argv)
               invo_name);
    }
 
               invo_name);
    }
 

+   /*
+    * If you're picking "raw" as a mode, then you have to select
+    * a format.
+    */
+
+   if (mode == RAW && form == NULL && format == NULL) {
+       adios (NULL, "You must specify a format with -form or -format when "
+              "using -raw");
+   }
+

     /*
      * Get new format string.  Must be before chdir().
      */
     /*
      * Get new format string.  Must be before chdir().
      */


@@ -477,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 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;
     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);
 
     if (! folder)
        folder = getfolder(1);


@@ -491,7 +508,7 @@ process_messages(struct format *fmt, struct msgs_array *comps,
     if (chdir(maildir) < 0)
        adios(maildir, "unable to change directory to");
 
     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)
        adios(NULL, "unable to read folder %s", folder);
 
     if (mp->nummsg == 0)


@@ -518,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)


@@ -560,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;
                }


@@ -571,29 +588,33 @@ process_messages(struct format *fmt, struct msgs_array *comps,
             */
 
            for (state = FLD;;) {
             */
 
            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) {
                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);
                        }
                    }
 
                            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")) {
                    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);
                    }
 
                        fmt_addcomptext("body", rbuf);
                    }


@@ -605,6 +626,7 @@ process_messages(struct format *fmt, struct msgs_array *comps,
            }
 finished:
            fclose(in);
            }
 finished:
            fclose(in);

+           m_getfld_state_destroy(&gstate);

 
            /*
             * Do this now to override any components in the original message
 
            /*
             * Do this now to override any components in the original message


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

+    ivector_free (seqnum);

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


@@ -974,8 +997,8 @@ f_typestr(int t)
        case FT_LS_COMP: return("LS_COMP");
        case FT_LS_LIT: return("LS_LIT");
        case FT_LS_GETENV: return("LS_GETENV");
        case FT_LS_COMP: return("LS_COMP");
        case FT_LS_LIT: return("LS_LIT");
        case FT_LS_GETENV: return("LS_GETENV");

-       case FT_LS_DECODECOMP: return("FT_LS_DECODECOMP");
-       case FT_LS_DECODE: return("FT_LS_DECODE");
+       case FT_LS_DECODECOMP: return("LS_DECODECOMP");
+       case FT_LS_DECODE: return("LS_DECODE");

        case FT_LS_TRIM: return("LS_TRIM");
        case FT_LV_COMP: return("LV_COMP");
        case FT_LV_COMPFLAG: return("LV_COMPFLAG");
        case FT_LS_TRIM: return("LS_TRIM");
        case FT_LV_COMP: return("LV_COMP");
        case FT_LV_COMPFLAG: return("LV_COMPFLAG");


@@ -1019,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_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");
        case FT_LV_NOHOSTF: return("LV_NOHOSTF");
        case FT_LOCALDATE: return("LOCALDATE");
        case FT_GMTDATE: return("GMTDATE");


@@ -1052,7 +1076,7 @@ f_typestr(int t)
        case FT_V_MATCH: return("V_MATCH");
        case FT_V_AMATCH: return("V_AMATCH");
        default:
        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);
        }
 }
                return(buf);
        }
 }


@@ -1279,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))