popsbr.c: Alter traverse() to check action callback's result.

[nmh] / uip / mhcachesbr.c

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 55a41d5d423276d76fd6d12412ac40eb8482c130..0c61fc0f60415e8fd3fe29e961444ae7cec262d1 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -14,6 +14,7 @@
 #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
@@ -368,18 +369,19 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
     int        state;
     char buf[NMH_BUFSIZ], name[NAMESZ];
     FILE *fp;
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
     int failed_to_lock = 0;
 
     if (!(fp = lkfopendata (mapfile, "r", &failed_to_lock)))
        return NOTOK;
 
+    gstate = m_getfld_state_init(fp);
     for (;;) {
        int result;
        char *cp, *dp;
        int bufsz = sizeof buf;
 
-       switch (state = m_getfld (&gstate, name, buf, &bufsz, fp)) {
+       switch (state = m_getfld2(&gstate, name, buf, &bufsz)) {
            case FLD:
            case FLDPLUS:
                strncpy (mapname, name, namelen);
@@ -389,7 +391,7 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
                    cp = mh_xstrdup(buf);
                    while (state == FLDPLUS) {
                        bufsz = sizeof buf;
-                       state = m_getfld (&gstate, name, buf, &bufsz, fp);
+                       state = m_getfld2(&gstate, name, buf, &bufsz);
                        cp = add (buf, cp);
                    }
                }