lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 786c0b6cccfb03e6c6707494ab0e61a90248a036..fea408357733dd72aa9312442f25821c53fe0554 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -17,8 +17,8 @@
 #include <h/mhcachesbr.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"
 
@@ -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;