X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/afee8ed17a56617618fb7f963b111d7cf0fb56e7..f345b9b480296b4b6a8469d6221752893c5d1420:/uip/mhcachesbr.c

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 25ac9ab0..7afbadd5 100644
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -9,10 +9,7 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
@@ -27,8 +24,6 @@
 
 extern int debugsw;
 
-extern pid_t xpid;	/* mhshowsbr.c or mhbuildsbr.c */
-
 /* cache policies */
 int rcachesw = CACHE_ASK;
 int wcachesw = CACHE_ASK;
@@ -42,7 +37,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);
@@ -96,7 +91,7 @@ cache_content (CT ct)
 {
     int	cachetype;
     char *file, cachefile[BUFSIZ];
-    CE ce = ct->c_cefile;
+    CE ce = &ct->c_cefile;
 
     if (!ct->c_id) {
 	advise (NULL, "no %s: field in %s", ID_FIELD, ct->c_file);
@@ -140,16 +135,18 @@ 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)) {
 		admonish (ce->ce_file, "error reading");
-		unlink (cachefile);
+		(void) m_unlink (cachefile);
 	    } else {
 		if (ferror (fp)) {
 		    admonish (cachefile, "error writing");
-		    unlink (cachefile);
+		    (void) m_unlink (cachefile);
 		}
 	    }
 	    fclose (fp);
@@ -228,13 +225,6 @@ got_it:
 	int len, buflen;
 	char *bp, query[BUFSIZ];
 
-	if (xpid) {
-	    if (xpid < 0)
-		xpid = -xpid;
-	    pidcheck (pidwait (xpid, NOTOK));
-	    xpid = 0;
-	}
-
 	/* Get buffer ready to go */
 	bp = query;
 	buflen = sizeof(query);
@@ -268,14 +258,14 @@ 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;
     }
 
     if (status == OK && writing) {
 	if (*writing && strchr(buffer, '/'))
 	    make_intermediates (buffer);
-	unlink (buffer);
+	(void) m_unlink (buffer);
     }
 
     free (id);
@@ -290,6 +280,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;
 
@@ -344,19 +335,22 @@ use_raw:
 
     make_intermediates (mapfile);
     mask = umask (writing == 2 ? 0077 : 0);
-    if (!(fp = lkfopen (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 = lkfopen (mapfile, "a");
+	    fp = lkfopendata (mapfile, "a", &failed_to_lock);
+            if (failed_to_lock) {
+		adios (mapfile, "failed to lock");
+            }
 	}
     }
     umask (mask);
     if (!fp)
 	return NOTOK;
     fprintf (fp, "%s: %s\n", mapname, id);
-    lkfclose (fp, mapfile);
+    lkfclosedata (fp, mapfile);
 
 done_map:
     if (*mapname == '/')
@@ -377,8 +371,9 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
     char buf[BUFSIZ], name[NAMESZ];
     FILE *fp;
     m_getfld_state_t gstate = 0;
+    int failed_to_lock = 0;
 
-    if (!(fp = lkfopen (mapfile, "r")))
+    if (!(fp = lkfopendata (mapfile, "r", &failed_to_lock)))
 	return NOTOK;
 
     for (;;) {
@@ -409,7 +404,7 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
 		result = strcmp (id, dp);
 		free (dp);
 		if (result == 0) {
-		    lkfclose (fp, mapfile);
+		    lkfclosedata (fp, mapfile);
 		    return OK;
 		}
 		continue;
@@ -423,6 +418,6 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
     }
     m_getfld_state_destroy (&gstate);
 
-    lkfclose (fp, mapfile);
+    lkfclosedata (fp, mapfile);
     return NOTOK;
 }