X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a23477eb9bd7d1af5f66a171041bf72af932488e..35ef9d158396dbf013a862dd8f830db64909826b:/uip/sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index 8fa9e5b5..3ebb5325 100644
--- 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) \
@@ -339,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++;
@@ -355,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)
@@ -364,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)
@@ -373,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;