X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0509728c8a506f287fa3483d8e8ffaf8fb66d41d..dbc35d5d494dd0ec68b7742446e42239a5e78bf1:/uip/mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 265b203f..80eddb27 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -15,7 +15,8 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "mhmisc.h"
+#include "sbr/m_maildir.h"
 #include "mhfree.h"
 
 #define MHSTORE_SWITCHES \
@@ -30,6 +31,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) \
@@ -46,28 +48,10 @@ DEFINE_SWITCH_ARRAY(MHSTORE, switches);
 #undef X
 
 
-/* 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;
-
 #define	quitser	pipeser
 
 /* mhparse.c */
 int debugsw = 0;
-CT parse_mime (char *);
-
-/* mhmisc.c */
-int part_ok (CT);
-int type_ok (CT, int);
-void flush_errors (void);
 
 /*
  * static prototypes
@@ -183,6 +167,10 @@ do_cache:
 		preferred_subtypes[npreferred++] = cp;
 		continue;
 
+	    case NPREFERSW:
+		npreferred = 0;
+		continue;
+
 	    case FILESW:
 		if (!(cp = *argp++) || (*cp == '-' && cp[1]))
 		    adios (NULL, "missing argument to %s", argp[-2]);
@@ -214,8 +202,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);
     }
@@ -229,7 +216,7 @@ do_cache:
      */
     if ((cp = getenv ("MHSTORE"))) {
 	if ((fp = fopen (cp, "r"))) {
-	    readconfig ((struct node **) 0, fp, cp, 0);
+	    readconfig(NULL, fp, cp, 0);
 	    fclose (fp);
 	} else {
 	    admonish ("", "unable to read $MHSTORE profile (%s)", cp);
@@ -240,7 +227,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);
     }