X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9a87f2bf9289ef232ec8c267fd7be76120c87ca2..8e5bcb24340597d842ff02eadd73bd9f775ea80a:/uip/mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index cf38ecf1..d3b8504e 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -15,10 +15,11 @@
 #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_popen.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_popen.h"
 #include "mhfree.h"
 #include "mhshowsbr.h"
 
@@ -42,6 +43,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) \
@@ -92,7 +94,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;
@@ -187,10 +189,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:
@@ -202,7 +208,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;
 
@@ -280,7 +286,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);
@@ -291,7 +297,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);
     }