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 cdb7f20f5c3c93120706ae4747763f0f51306870..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 <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 \
 #include "mhfree.h"
 
 #define MHSTORE_SWITCHES \


@@ -31,6 +31,7 @@
     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \
     X("prefer content", 0, PREFERSW) \
     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \
     X("prefer content", 0, PREFERSW) \

+    X("noprefer", 0, NPREFERSW) \

     X("rcache policy", 0, RCACHESW) \
     X("wcache policy", 0, WCACHESW) \
     X("version", 0, VERSIONSW) \
     X("rcache policy", 0, RCACHESW) \
     X("wcache policy", 0, WCACHESW) \
     X("version", 0, VERSIONSW) \


@@ -51,7 +52,6 @@ DEFINE_SWITCH_ARRAY(MHSTORE, switches);
 
 /* mhparse.c */
 int debugsw = 0;
 
 /* mhparse.c */
 int debugsw = 0;

-CT parse_mime (char *);

 
 /*
  * static prototypes
 
 /*
  * static prototypes


@@ -161,10 +161,14 @@ do_cache:
                if (npreferred >= NPREFS)
                    adios (NULL, "too many preferred types (starting with %s), %d max",
                           cp, NPREFS);
                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';
                cp = strchr(cp, '/');
                if (cp) *cp++ = '\0';

-               preferred_subtypes[npreferred++] = cp;
+               mime_preference[npreferred++].subtype = cp;
+               continue;
+
+           case NPREFERSW:
+               npreferred = 0;

                continue;
 
            case FILESW:
                continue;
 
            case FILESW:


@@ -212,7 +216,7 @@ do_cache:
      */
     if ((cp = getenv ("MHSTORE"))) {
        if ((fp = fopen (cp, "r"))) {
      */
     if ((cp = getenv ("MHSTORE"))) {
        if ((fp = fopen (cp, "r"))) {

-           readconfig ((struct node **) 0, fp, cp, 0);
+           readconfig(NULL, fp, cp, 0);

            fclose (fp);
        } else {
            admonish ("", "unable to read $MHSTORE profile (%s)", cp);
            fclose (fp);
        } else {
            admonish ("", "unable to read $MHSTORE profile (%s)", cp);


@@ -223,7 +227,7 @@ do_cache:
      * Read the standard profile setup
      */
     if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {
      * Read the standard profile setup
      */
     if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {

-       readconfig ((struct node **) 0, fp, cp, 0);
+       readconfig(NULL, fp, cp, 0);

        fclose (fp);
     }
 
        fclose (fp);
     }