X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..bf3160aa94f981374f0c6353344fd68a4e1daa12:/uip/show.c

diff --git a/uip/show.c b/uip/show.c
index 0e7e7911..dfe5052c 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/mime.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 #define SHOW_SWITCHES \
     X("checkmime", 0, CHECKMIMESW) \
@@ -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) {
 
@@ -367,16 +368,16 @@ is_nontext (char *msgnam)
 {
     int	result, state;
     char *bp, *dp, *cp;
-    char buf[BUFSIZ], name[NAMESZ];
+    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;