X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/de06ed5f176a5fa3eb5522bb9a9741f9c3f1d0f4..6fd1d18f:/uip/mhstore.c?ds=sidebyside

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 2b08a6ba..7fa819aa 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -14,9 +14,10 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
+#include "h/done.h"
 #include <h/utils.h>
 #include "mhmisc.h"
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 #include "mhfree.h"
 
 #define MHSTORE_SWITCHES \
@@ -31,6 +32,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) \
@@ -77,7 +79,7 @@ main (int argc, char **argv)
 
     if (nmh_init(argv[0], 1)) { return 1; }
 
-    done=freects_done;
+    set_done(freects_done);
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -160,10 +162,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: