X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0777e6ec42f207b1a224de0ee4a2e4ae8c0b7b7b..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index a118f642..fea40835 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -1,6 +1,4 @@
-
-/*
- * mhshow.c -- display the contents of MIME messages
+/* mhshow.c -- display the contents of MIME 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
@@ -13,10 +11,16 @@
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
+#include <h/fmt_scan.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
+#include "mhmisc.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_popen.h"
+#include "mhfree.h"
+#include "mhshowsbr.h"
 
 #define MHSHOW_SWITCHES \
     X("check", 0, CHECKSW) \
@@ -38,6 +42,7 @@
     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \
     X("prefer content", 0, PREFERSW) \
+    X("noprefer", 0, NPREFERSW) \
     X("rcache policy", 0, RCACHESW) \
     X("wcache policy", 0, WCACHESW) \
     X("version", 0, VERSIONSW) \
@@ -63,50 +68,11 @@ DEFINE_SWITCH_ARRAY(MHSHOW, switches);
 #undef X
 
 
-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-extern char *cache_public;
-extern char *cache_private;
-
-/* mhshowsbr.c */
-extern char *progsw;
-extern int nomore;	/* flags for moreproc/header display */
-extern char *formsw;
-extern char *folder;
-extern char *headerform;
-extern char *markerform;
-extern int headersw;
-
-/* mhmisc.c */
-extern int npart;
-extern int ntype;
-extern char *parts[NPARTS + 1];
-extern char *types[NTYPES + 1];
-extern int userrs;
-
-/* mhparse.c */
-extern char *preferred_types[];
-extern  char *preferred_subtypes[];
-extern int npreferred;
-
 int debugsw = 0;
 int verbosw = 0;
 
 #define	quitser	pipeser
 
-/* mhparse.c */
-CT parse_mime (char *);
-
-/* mhmisc.c */
-int part_ok (CT);
-int type_ok (CT, int);
-void flush_errors (void);
-
-/* mhfree.c */
-extern CT *cts;
-void freects_done (int) NORETURN;
-
 /*
  * static prototypes
  */
@@ -161,9 +127,9 @@ main (int argc, char **argv)
 do_cache:
 		if (!(cp = *argp++) || *cp == '-')
 		    adios (NULL, "missing argument to %s", argp[-2]);
-		switch (*icachesw = smatch (cp, caches)) {
+		switch (*icachesw = smatch (cp, cache_policy)) {
 		case AMBIGSW:
-		    ambigsw (cp, caches);
+		    ambigsw (cp, cache_policy);
 		    done (1);
 		case UNKWNSW:
 		    adios (NULL, "%s unknown", cp);
@@ -222,10 +188,14 @@ do_cache:
 		if (npreferred >= NPREFS)
 		    adios (NULL, "too many preferred types (starting with %s), %d max",
 			   cp, NPREFS);
-		preferred_types[npreferred] = cp;
+		mime_preference[npreferred].type = cp;
 		cp = strchr(cp, '/');
 		if (cp) *cp++ = '\0';
-		preferred_subtypes[npreferred++] = cp;
+		mime_preference[npreferred++].subtype = cp;
+		continue;
+
+	    case NPREFERSW:
+		npreferred = 0;
 		continue;
 
 	    case FILESW:
@@ -237,7 +207,7 @@ do_cache:
 	    case FORMSW:
 		if (!(cp = *argp++) || *cp == '-')
 		    adios (NULL, "missing argument to %s", argp[-2]);
-                mh_xfree(formsw);
+                free(formsw);
 		formsw = getcpy (etcpath (cp));
 		continue;
 
@@ -289,8 +259,7 @@ do_cache:
 	if (*cp == '+' || *cp == '@') {
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
-	    else
-		folder = pluspath (cp);
+            folder = pluspath (cp);
 	} else
 		app_msgarg(&msgs, cp);
     }
@@ -316,7 +285,7 @@ do_cache:
      */
     if ((cp = getenv ("MHSHOW"))) {
 	if ((fp = fopen (cp, "r"))) {
-	    readconfig ((struct node **) 0, fp, cp, 0);
+	    readconfig(NULL, fp, cp, 0);
 	    fclose (fp);
 	} else {
 	    admonish ("", "unable to read $MHSHOW profile (%s)", cp);
@@ -327,7 +296,7 @@ do_cache:
      * Read the standard profile setup
      */
     if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {
-	readconfig ((struct node **) 0, fp, cp, 0);
+	readconfig(NULL, fp, cp, 0);
 	fclose (fp);
     }
 
@@ -454,7 +423,7 @@ do_cache:
     for (ctp = cts; *ctp; ctp++)
 	free_content (*ctp);
 
-    free ((char *) cts);
+    free(cts);
     cts = NULL;
 
     if (concatsw)