X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a23477eb9bd7d1af5f66a171041bf72af932488e..8699f1cc:/uip/show.c?ds=inline

diff --git a/uip/show.c b/uip/show.c
index 8ff381fb..def62759 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -7,7 +7,9 @@
 
 #include <h/mh.h>
 #include <h/mime.h>
+#include "h/done.h"
 #include <h/utils.h>
+#include "sbr/m_maildir.h"
 
 #define SHOW_SWITCHES \
     X("checkmime", 0, CHECKMIMESW) \
@@ -187,8 +189,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;
@@ -297,7 +298,7 @@ go_to_it: ;
     }
 
     if (folder && !draftsw && !file)
-	m_putenv ("mhfolder", folder);
+	setenv("mhfolder", folder, 1);
 
     if (strcmp (r1bindex (proc, '/'), "cat") == 0) {
 
@@ -369,14 +370,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:
 	    /*
@@ -389,7 +390,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;
@@ -413,7 +414,7 @@ invalid:
 			    continue;
 			case '(':
 			    i++;
-			    /* FALLTHRU */
+			    continue;
 			default:
 			    continue;
 			case ')':
@@ -494,7 +495,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++)
@@ -521,7 +522,7 @@ out:
 	     */
 	    while (state == FLDPLUS) {
 		bufsz = sizeof buf;
-		state = m_getfld (&gstate, name, buf, &bufsz, fp);
+		state = m_getfld2(&gstate, name, buf, &bufsz);
 	    }
 	    break;