X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bc4927948a1b01bf2ae8b952dfd2639c1f929f00..d205d39a:/uip/mhcachesbr.c?ds=sidebyside

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 7ac0a0de..f343bf39 100644
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -1,6 +1,4 @@
-
-/*
- * mhcachesbr.c -- routines to manipulate the MIME content cache
+/* mhcachesbr.c -- routines to manipulate the MIME content cache
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -16,12 +14,19 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
+#include "../sbr/lock_file.h"
+#include "../sbr/m_mktemp.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
 #include <time.h>
 
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(CACHE, caches);
+#undef X
+struct swit *cache_policy = caches;
+
 extern int debugsw;
 
 /* cache policies */
@@ -42,12 +47,6 @@ int type_ok (CT, int);
 void content_error (char *, CT, char *, ...);
 void flush_errors (void);
 
-/*
- * prototypes
- */
-void cache_all_messages (CT *);
-int find_cache (CT, int, int *, char *, char *, int);
-
 /*
  * static prototypes
  */
@@ -94,19 +93,19 @@ cache_content (CT ct)
     CE ce = &ct->c_cefile;
 
     if (!ct->c_id) {
-	advise (NULL, "no %s: field in %s", ID_FIELD, ct->c_file);
+	inform("no %s: field in %s", ID_FIELD, ct->c_file);
 	return;
     }
 
     if (!ce) {
-	advise (NULL, "unable to decode %s", ct->c_file);
+	inform("unable to decode %s", ct->c_file);
 	return;
     }
 
     if (find_cache (NULL, wcachesw != CACHE_NEVER ? wcachesw : CACHE_ASK,
 		    &cachetype, ct->c_id, cachefile, sizeof(cachefile))
 	    == NOTOK) {
-	advise (NULL, "unable to cache %s's contents", ct->c_file);
+	inform("unable to cache %s's contents", ct->c_file);
 	return;
     }
     if (wcachesw != CACHE_NEVER && wcachesw != CACHE_ASK) {
@@ -368,7 +367,7 @@ static int
 find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
 {
     int	state;
-    char buf[BUFSIZ], name[NAMESZ];
+    char buf[NMH_BUFSIZ], name[NAMESZ];
     FILE *fp;
     m_getfld_state_t gstate = 0;
     int failed_to_lock = 0;