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

diff --git a/uip/mhshow.c b/uip/mhshow.c
index a118f642..07590911 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,15 @@
 #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 "../sbr/m_maildir.h"
+#include "../sbr/m_popen.h"
+#include "mhfree.h"
+#include "mhshowsbr.h"
 
 #define MHSHOW_SWITCHES \
     X("check", 0, CHECKSW) \
@@ -63,21 +66,6 @@ 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;
@@ -103,10 +91,6 @@ 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 +145,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);
@@ -454,7 +438,7 @@ do_cache:
     for (ctp = cts; *ctp; ctp++)
 	free_content (*ctp);
 
-    free ((char *) cts);
+    free(cts);
     cts = NULL;
 
     if (concatsw)