X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ceeb47c04f8abb144a3fbaeae3a54010175c2d36..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/mhshow.c diff --git a/uip/mhshow.c b/uip/mhshow.c index 786c0b6c..fea40835 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -17,8 +17,8 @@ #include #include #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" @@ -188,10 +188,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 +207,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;