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

[nmh] / uip / mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index b8feba96ecdf0ccf5eeed27635533aaf1613960f..ed6ad77fddcec97d3de0971c0e43ca57aeb6cbb0 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -16,7 +16,7 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 #include "mhfree.h"
 
 #define MHSTORE_SWITCHES \
@@ -161,10 +161,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: