X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1e18bf0ab892a2ae9d3151c248b652898f7d7116..6015bb1f7:/uip/show.c?ds=inline

diff --git a/uip/show.c b/uip/show.c
index ac012927..55707da4 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -188,8 +188,7 @@ usage:
 	if (*cp == '+' || *cp == '@') {
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
-	    else
-		folder = pluspath (cp);
+            folder = pluspath (cp);
 	} else {
 	    if (mode != SHOW)
 		goto usage;
@@ -370,14 +369,14 @@ is_nontext (char *msgnam)
     char *bp, *dp, *cp;
     char buf[NMH_BUFSIZ], name[NAMESZ];
     FILE *fp;
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
 
     if ((fp = fopen (msgnam, "r")) == NULL)
 	return 0;
-
+    gstate = m_getfld_state_init(fp);
     for (;;) {
 	int bufsz = sizeof buf;
-	switch (state = m_getfld (&gstate, name, buf, &bufsz, fp)) {
+	switch (state = m_getfld2(&gstate, name, buf, &bufsz)) {
 	case FLD:
 	case FLDPLUS:
 	    /*
@@ -390,7 +389,7 @@ is_nontext (char *msgnam)
 		cp = mh_xstrdup(buf);
 		while (state == FLDPLUS) {
 		    bufsz = sizeof buf;
-		    state = m_getfld (&gstate, name, buf, &bufsz, fp);
+		    state = m_getfld2(&gstate, name, buf, &bufsz);
 		    cp = add (buf, cp);
 		}
 		bp = cp;
@@ -495,7 +494,7 @@ out:
 		cp = mh_xstrdup(buf);
 		while (state == FLDPLUS) {
 		    bufsz = sizeof buf;
-		    state = m_getfld (&gstate, name, buf, &bufsz, fp);
+		    state = m_getfld2(&gstate, name, buf, &bufsz);
 		    cp = add (buf, cp);
 		}
 		for (bp = cp; isspace ((unsigned char) *bp); bp++)
@@ -522,7 +521,7 @@ out:
 	     */
 	    while (state == FLDPLUS) {
 		bufsz = sizeof buf;
-		state = m_getfld (&gstate, name, buf, &bufsz, fp);
+		state = m_getfld2(&gstate, name, buf, &bufsz);
 	    }
 	    break;