cppflags.m4: Don't trample CFLAGS and CPPFLAGS.

[nmh] / uip / sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index dc62f5638fbe2cc94e566e8413d493ba6987d2cf..3ebb53257cb389fd06442c5b0991e4480c4e26a5 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -340,15 +340,16 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
     struct tws *tw;
     char *datecomp = NULL, *subjcomp = NULL;
     FILE *in;
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
 
     if ((in = fopen (msgnam = m_name (msg), "r")) == NULL) {
        admonish (msgnam, "unable to read message");
        return (0);
     }
+    gstate = m_getfld_state_init(in);
     for (compnum = 1;;) {
        int bufsz = sizeof buf;
-       switch (state = m_getfld (&gstate, nam, buf, &bufsz, in)) {
+       switch (state = m_getfld2(&gstate, nam, buf, &bufsz)) {
        case FLD:
        case FLDPLUS:
            compnum++;
@@ -356,7 +357,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
                datecomp = add (buf, datecomp);
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
-                   state = m_getfld (&gstate, nam, buf, &bufsz, in);
+                   state = m_getfld2(&gstate, nam, buf, &bufsz);
                    datecomp = add (buf, datecomp);
                }
                if (!subjsort || subjcomp)
@@ -365,7 +366,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
                subjcomp = add (buf, subjcomp);
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
-                   state = m_getfld (&gstate, nam, buf, &bufsz, in);
+                   state = m_getfld2(&gstate, nam, buf, &bufsz);
                    subjcomp = add (buf, subjcomp);
                }
                if (datecomp)
@@ -374,7 +375,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
                /* just flush this guy */
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
-                   state = m_getfld (&gstate, nam, buf, &bufsz, in);
+                   state = m_getfld2(&gstate, nam, buf, &bufsz);
                }
            }
            continue;