X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4c436246f048635446353dadaa68174445c58160..c3238c0e:/uip/mhcachesbr.c

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 7e684e1f..fe4f4790 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
@@ -9,7 +7,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <h/signals.h>
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
@@ -38,7 +35,7 @@ char *cache_private;
 
 
 /* mhmisc.c */
-int part_ok (CT, int);
+int part_ok (CT);
 int type_ok (CT, int);
 void content_error (char *, CT, char *, ...);
 void flush_errors (void);
@@ -95,19 +92,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) {
@@ -136,7 +133,9 @@ cache_content (CT ct)
 
 	    while ((cc = fread (buffer, sizeof(*buffer), sizeof(buffer), gp))
 		       > 0)
-		fwrite (buffer, sizeof(*buffer), cc, fp);
+		if ((int) fwrite (buffer, sizeof(*buffer), cc, fp) < cc) {
+		    advise ("cache_content", "fwrite");
+		}
 	    fflush (fp);
 
 	    if (ferror (gp)) {
@@ -230,7 +229,7 @@ got_it:
 
 	/* Now, construct query */
 	if (writing) {
-	    snprintf (bp, buflen, "Make cached, publically-accessible copy");
+	    snprintf (bp, buflen, "Make cached, publicly-accessible copy");
 	} else {
 	    struct stat st;
 
@@ -257,7 +256,7 @@ got_it:
 	snprintf (bp, buflen, "\n    in file %s? ", buffer);
 
 	/* Now, check answer */
-	if (!getanswer (query))
+	if (!read_yes_or_no_if_tty (query))
 	    status = NOTOK;
     }
 
@@ -279,6 +278,7 @@ find_cache_aux (int writing, char *directory, char *id,
     int	mask, usemap;
     char mapfile[BUFSIZ], mapname[BUFSIZ];
     FILE *fp;
+    int failed_to_lock = 0;
     static int partno, pid;
     static time_t clock = 0;
 
@@ -333,12 +333,15 @@ use_raw:
 
     make_intermediates (mapfile);
     mask = umask (writing == 2 ? 0077 : 0);
-    if (!(fp = lkfopendata (mapfile, "a")) && errno == ENOENT) {
+    if (!(fp = lkfopendata (mapfile, "a", &failed_to_lock)) && errno == ENOENT) {
 	int fd;
 
 	if ((fd = creat (mapfile, 0666)) != NOTOK) {
 	    close (fd);
-	    fp = lkfopendata (mapfile, "a");
+	    fp = lkfopendata (mapfile, "a", &failed_to_lock);
+            if (failed_to_lock) {
+		adios (mapfile, "failed to lock");
+            }
 	}
     }
     umask (mask);
@@ -363,11 +366,12 @@ 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;
 
-    if (!(fp = lkfopendata (mapfile, "r")))
+    if (!(fp = lkfopendata (mapfile, "r", &failed_to_lock)))
 	return NOTOK;
 
     for (;;) {
@@ -382,7 +386,7 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
 		if (state != FLDPLUS)
 		    cp = buf;
 		else {
-		    cp = add (buf, NULL);
+		    cp = mh_xstrdup(buf);
 		    while (state == FLDPLUS) {
 			bufsz = sizeof buf;
 			state = m_getfld (&gstate, name, buf, &bufsz, fp);