aliasbr.c: Remove duplicate prototypes. Others in aliasbr.h.

[nmh] / uip / sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index 2a711199a19600948b38fc9ec10577f318056953..84f8e085904025b6678c9d40aab93a2f19991a38 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define SORTM_SWITCHES \
     X("datefield field", 0, DATESW) \
@@ -166,10 +167,9 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
-               app_msgarg(&msgs, cp);
+            app_msgarg(&msgs, cp);
     }
 
     if (!context_find ("path"))
@@ -335,19 +335,20 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 {
     int state;
     int compnum;
-    char *msgnam, buf[BUFSIZ], nam[NAMESZ];
+    char *msgnam, buf[NMH_BUFSIZ], nam[NAMESZ];
     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++;
@@ -355,7 +356,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)
@@ -364,7 +365,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)
@@ -373,7 +374,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;
@@ -431,10 +432,9 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
            if (strcmp (subjsort, "subject") == 0) {
                while ((c = *cp)) {
                    if (! isspace((unsigned char) c)) {
-                       if(uprf(cp, "re:"))
-                           cp += 2;
-                       else
+                       if(!uprf(cp, "re:"))
                            break;
+                        cp += 2;
                    }
                    cp++;
                }