X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d1797eb2b2d5f3aa1b653e6a2562bf79c559eeb2..8b10463acb041e438ca60a760ea176fc5a1623f4:/uip/mhlist.c

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 0dc142a3..a9be19e1 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -15,6 +15,8 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
+#include "mhmisc.h"
+#include "../sbr/m_maildir.h"
 #include "mhfree.h"
 
 #define MHLIST_SWITCHES \
@@ -48,25 +50,6 @@ DEFINE_SWITCH_ENUM(MHLIST);
 DEFINE_SWITCH_ARRAY(MHLIST, switches);
 #undef X
 
-
-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-extern char *cache_public;
-extern char *cache_private;
-
-/* 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;
-
 /*
  * This is currently needed to keep mhparse happy.
  * This needs to be changed.
@@ -75,14 +58,6 @@ int debugsw = 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);
-
 /*
  * static prototypes
  */
@@ -137,9 +112,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);
@@ -232,8 +207,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);
     }