X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/df6971a59e8d01dcfe605bbac949b7d4b3ab0a92..83a46f99f22d85668aec9f7de2d16ddd015359df:/uip/mshcmds.c

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index 9937a1dd..cdda3c99 100644
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -1075,9 +1075,8 @@ static char *hlpmsg[] = {
 void
 helpcmd (char **args)
 {
-    NMH_UNUSED (args);
-
     int i;
+    NMH_UNUSED (args);
 
     for (i = 0; hlpmsg[i]; i++) {
 	printf (hlpmsg[i], invo_name);
@@ -2274,7 +2273,7 @@ showcmd (char **args)
 	    return;
     seq_setprev (mp);
 
-    if (!nshow && !getenv ("NOMHNPROC"))
+    if (!nshow)
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
 	    if (is_selected (mp, msgnum) && is_nontext (msgnum)) {
 		proc = showmimeproc;
@@ -2436,11 +2435,11 @@ is_nontext (int msgnum)
 
     fp = msh_ready (msgnum, 1);
 
-    for (state = FLD;;)
-	switch (state = m_getfld (state, name, buf, sizeof buf, fp)) {
+    for (state = FLD;;) {
+	int bufsz = sizeof buf;
+	switch (state = m_getfld (state, name, buf, &bufsz, fp)) {
 	case FLD:
 	case FLDPLUS:
-	case FLDEOF:
 	    /*
 	     * Check Content-Type field
 	     */
@@ -2450,7 +2449,8 @@ is_nontext (int msgnum)
 
 		cp = add (buf, NULL);
 		while (state == FLDPLUS) {
-		    state = m_getfld (state, name, buf, sizeof buf, fp);
+		    bufsz = sizeof buf;
+		    state = m_getfld (state, name, buf, &bufsz, fp);
 		    cp = add (buf, cp);
 		}
 		bp = cp;
@@ -2553,7 +2553,8 @@ out:
 	    if (!mh_strcasecmp (name, ENCODING_FIELD)) {
 		cp = add (buf, NULL);
 		while (state == FLDPLUS) {
-		    state = m_getfld (state, name, buf, sizeof buf, fp);
+		    bufsz = sizeof buf;
+		    state = m_getfld (state, name, buf, &bufsz, fp);
 		    cp = add (buf, cp);
 		}
 		for (bp = cp; isspace (*bp); bp++)
@@ -2577,8 +2578,10 @@ out:
 	     * Just skip the rest of this header
 	     * field and go to next one.
 	     */
-	    while (state == FLDPLUS)
-		state = m_getfld (state, name, buf, sizeof(buf), fp);
+	    while (state == FLDPLUS) {
+		bufsz = sizeof buf;
+		state = m_getfld (state, name, buf, &bufsz, fp);
+	    }
 	    break;
 
 	    /*
@@ -2588,6 +2591,7 @@ out:
 	default:
 	    return 0;
 	}
+    }
 }
 
 
@@ -2743,14 +2747,15 @@ get_fields (char *datesw, char *subjsw, int msgnum, struct Msg *msgp)
 
     zp = msh_ready (msgnum, 0);
     for (state = FLD;;) {
-	switch (state = m_getfld (state, name, buf, sizeof buf, zp)) {
+	int bufsz = sizeof buf;
+	switch (state = m_getfld (state, name, buf, &bufsz, zp)) {
 	    case FLD: 
-	    case FLDEOF: 
 	    case FLDPLUS: 
 		if (!mh_strcasecmp (name, datesw)) {
 		    bp = getcpy (buf);
 		    while (state == FLDPLUS) {
-			state = m_getfld (state, name, buf, sizeof buf, zp);
+			bufsz = sizeof buf;
+			state = m_getfld (state, name, buf, &bufsz, zp);
 			bp = add (buf, bp);
 		    }
 		    if ((tw = dparsetime (bp)) == NULL)
@@ -2767,7 +2772,8 @@ get_fields (char *datesw, char *subjsw, int msgnum, struct Msg *msgp)
 		else if (subjsw && !mh_strcasecmp(name, subjsw)) {
 		    bp = getcpy (buf);
 		    while (state == FLDPLUS) {
-			state = m_getfld (state, name, buf, sizeof buf, zp);
+			bufsz = sizeof buf;
+			state = m_getfld (state, name, buf, &bufsz, zp);
 			bp = add (buf, bp);
 		    }
 		    msgp->m_scanl = sosmash(subjsw, bp);
@@ -2776,13 +2782,14 @@ get_fields (char *datesw, char *subjsw, int msgnum, struct Msg *msgp)
 		    else
 			subjsw = (char *)0;/* subject done, need date */
 		} else {
-		    while (state == FLDPLUS)	/* flush this one */
-			state = m_getfld (state, name, buf, sizeof buf, zp);
+		    while (state == FLDPLUS) {	/* flush this one */
+			bufsz = sizeof buf;
+			state = m_getfld (state, name, buf, &bufsz, zp);
+		    }
 		}
 		continue;
 
 	    case BODY: 
-	    case BODYEOF: 
 	    case FILEEOF: 
 		break;