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

[nmh] / uip / mhcachesbr.c

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 0c61fc0f60415e8fd3fe29e961444ae7cec262d1..b740e231e2e2ad58fc142136c95acbf4286281c1 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -14,8 +14,9 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>

-#include "../sbr/lock_file.h"
-#include "../sbr/m_mktemp.h"
+#include "mhmisc.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_mktemp.h"

 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>


@@ -40,13 +41,6 @@ int wcachesw = CACHE_ASK;
 char *cache_public;
 char *cache_private;
 
 char *cache_public;
 char *cache_private;
 

-
-/* mhmisc.c */
-int part_ok (CT);
-int type_ok (CT, int);
-void content_error (char *, CT, char *, ...);
-void flush_errors (void);
-

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


@@ -187,7 +181,7 @@ find_cache (CT ct, int policy, int *writing, char *id,
        case CACHE_PUBLIC:
            if (cache_private
                    && !writing
        case CACHE_PUBLIC:
            if (cache_private
                    && !writing

-                   && find_cache_aux (writing ? 2 : 0, cache_private, id,
+                   && find_cache_aux (0, cache_private, id,

                                       buffer, buflen) == OK) {
                if (access (buffer, R_OK) != NOTOK) {
 got_private:
                                       buffer, buflen) == OK) {
                if (access (buffer, R_OK) != NOTOK) {
 got_private: