X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ceeb47c04f8abb144a3fbaeae3a54010175c2d36..8e5bcb24340597d842ff02eadd73bd9f775ea80a:/uip/mhshow.c?ds=sidebyside

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 786c0b6c..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"
 
@@ -93,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;
@@ -188,10 +189,10 @@ 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:
@@ -207,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;