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

[nmh] / uip / mhn.c

diff --git a/uip/mhn.c b/uip/mhn.c
index 0223a42f0a21f39d4a394776d10733fac644cbe1..4a3b33a769f117d2881753fcc28e04ab0c9dc307 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -17,7 +17,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"
 #include "mhshowsbr.h"
 
 #include "mhfree.h"
 #include "mhshowsbr.h"
 


@@ -95,9 +95,6 @@ static int storesw = 0;
 
 #define        quitser pipeser
 
 
 #define        quitser pipeser
 

-/* mhparse.c */
-CT parse_mime (char *);
-

 /*
  * static prototypes
  */
 /*
  * static prototypes
  */


@@ -249,7 +246,7 @@ do_cache:
            case FORMSW:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
            case FORMSW:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);

-                mh_xfree(formsw);
+                free(formsw);

                formsw = getcpy (etcpath (cp));
                continue;
 
                formsw = getcpy (etcpath (cp));
                continue;
 


@@ -314,7 +311,7 @@ do_cache:
      */
     if ((cp = getenv ("MHN"))) {
        if ((fp = fopen (cp, "r"))) {
      */
     if ((cp = getenv ("MHN"))) {
        if ((fp = fopen (cp, "r"))) {

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

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


@@ -325,7 +322,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);
     }