runpty.c: Factor duplicate code into new open_master_pty().

[nmh] / uip / mhlist.c

diff --git a/uip/mhlist.c b/uip/mhlist.c
index bc8e2a25eafca04d17bf197156189f808ed5f9fa..aa304e6890965302b4e3e17e051440a762f0cae2 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.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 MHLIST_SWITCHES \
@@ -79,7 +80,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;
@@ -169,10 +170,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: