X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bfad64befb4d6696fdfb63b119666eec4bac6fb3..521674623:/uip/mhcachesbr.c?ds=inline

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 5f7777d0..0bf725c6 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>
@@ -96,7 +94,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);
@@ -344,19 +342,19 @@ use_raw:
 
     make_intermediates (mapfile);
     mask = umask (writing == 2 ? 0077 : 0);
-    if (!(fp = lkfopen (mapfile, "a")) && errno == ENOENT) {
+    if (!(fp = lkfopendata (mapfile, "a")) && errno == ENOENT) {
 	int fd;
 
 	if ((fd = creat (mapfile, 0666)) != NOTOK) {
 	    close (fd);
-	    fp = lkfopen (mapfile, "a");
+	    fp = lkfopendata (mapfile, "a");
 	}
     }
     umask (mask);
     if (!fp)
 	return NOTOK;
     fprintf (fp, "%s: %s\n", mapname, id);
-    lkfclose (fp, mapfile);
+    lkfclosedata (fp, mapfile);
 
 done_map:
     if (*mapname == '/')
@@ -376,25 +374,27 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
     int	state;
     char buf[BUFSIZ], name[NAMESZ];
     FILE *fp;
+    m_getfld_state_t gstate = 0;
 
-    if (!(fp = lkfopen (mapfile, "r")))
+    if (!(fp = lkfopendata (mapfile, "r")))
 	return NOTOK;
 
-    for (state = FLD;;) {
+    for (;;) {
 	int result;
 	char *cp, *dp;
+	int bufsz = sizeof buf;
 
-	switch (state = m_getfld (state, name, buf, sizeof(buf), fp)) {
+	switch (state = m_getfld (&gstate, name, buf, &bufsz, fp)) {
 	    case FLD:
 	    case FLDPLUS:
-	    case FLDEOF:
 	        strncpy (mapname, name, namelen);
 		if (state != FLDPLUS)
 		    cp = buf;
 		else {
 		    cp = add (buf, NULL);
 		    while (state == FLDPLUS) {
-			state = m_getfld (state, name, buf, sizeof(buf), fp);
+			bufsz = sizeof buf;
+			state = m_getfld (&gstate, name, buf, &bufsz, fp);
 			cp = add (buf, cp);
 		    }
 		}
@@ -407,22 +407,20 @@ 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;
 		}
-		if (state != FLDEOF)
-		    continue;
-		/* else fall... */
+		continue;
 
 	    case BODY:
-	    case BODYEOF:
 	    case FILEEOF:
 	    default:
 		break;
 	}
 	break;
     }
+    m_getfld_state_destroy (&gstate);
 
-    lkfclose (fp, mapfile);
+    lkfclosedata (fp, mapfile);
     return NOTOK;
 }