X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2e08fdfc0ef872c968c2e42b7ee0ede42aee14aa..eca5581770eb3ddef74af16e750fec119871b1f9:/uip/mhcachesbr.c

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 5f7e1479..7e684e1f 100644
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -11,8 +11,6 @@
 #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 +25,6 @@
 
 extern int debugsw;
 
-extern pid_t xpid;	/* mhshowsbr.c or mhbuildsbr.c */
-
 /* cache policies */
 int rcachesw = CACHE_ASK;
 int wcachesw = CACHE_ASK;
@@ -96,7 +92,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);
@@ -145,11 +141,11 @@ cache_content (CT ct)
 
 	    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 +224,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);
@@ -275,7 +264,7 @@ got_it:
     if (status == OK && writing) {
 	if (*writing && strchr(buffer, '/'))
 	    make_intermediates (buffer);
-	unlink (buffer);
+	(void) m_unlink (buffer);
     }
 
     free (id);