X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/961d5bf9387fcaa225caa2bc72c71d8bc8d64849..d711510305:/uip/show.c?ds=sidebyside

diff --git a/uip/show.c b/uip/show.c
index 32917398..ac012927 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -1,5 +1,4 @@
-/*
- * show.c -- show/list messages
+/* show.c -- show/list messages
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -9,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) \
@@ -96,6 +96,7 @@ main (int argc, char **argv)
 		    goto non_mhl_switches;
 		case NHEADSW:
 		    headersw = 0;
+		    /* FALLTHRU */
 		case CONCATSW:
 		case NCONCATSW:
 non_mhl_switches:
@@ -192,8 +193,7 @@ usage:
 	} else {
 	    if (mode != SHOW)
 		goto usage;
-	    else
-		app_msgarg(&msgs, cp);
+            app_msgarg(&msgs, cp);
 	}
     }
 
@@ -259,7 +259,7 @@ usage:
 
     for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
 	if (is_selected(mp, msgnum))
-	    app_msgarg(&vec, getcpy (m_name (msgnum)));
+	    app_msgarg(&vec, mh_xstrdup(m_name (msgnum)));
 
     seq_setcur (mp, mp->hghsel);	/* update current message  */
     seq_save (mp);			/* synchronize sequences   */
@@ -298,7 +298,7 @@ go_to_it: ;
     }
 
     if (folder && !draftsw && !file)
-	m_putenv ("mhfolder", folder);
+	setenv("mhfolder", folder, 1);
 
     if (strcmp (r1bindex (proc, '/'), "cat") == 0) {
 
@@ -368,7 +368,7 @@ 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;
 
@@ -387,7 +387,7 @@ is_nontext (char *msgnam)
 		int passno;
 		char c;
 
-		cp = add (buf, NULL);
+		cp = mh_xstrdup(buf);
 		while (state == FLDPLUS) {
 		    bufsz = sizeof buf;
 		    state = m_getfld (&gstate, name, buf, &bufsz, fp);
@@ -414,7 +414,7 @@ invalid:
 			    continue;
 			case '(':
 			    i++;
-			    /* and fall... */
+			    continue;
 			default:
 			    continue;
 			case ')':
@@ -447,7 +447,7 @@ invalid:
 		    if (*dp) {
 			if ((result = !uprf (dp, "charset")))
 			    goto out;
-			dp += sizeof("charset") - 1;
+			dp += LEN("charset");
 			while (isspace ((unsigned char) *dp))
 			    dp++;
 			if (*dp++ != '=')
@@ -492,7 +492,7 @@ out:
 	     * Check Content-Transfer-Encoding field
 	     */
 	    if (!strcasecmp (name, ENCODING_FIELD)) {
-		cp = add (buf, NULL);
+		cp = mh_xstrdup(buf);
 		while (state == FLDPLUS) {
 		    bufsz = sizeof buf;
 		    state = m_getfld (&gstate, name, buf, &bufsz, fp);