Added bytes_read to m_getfld() buffer state. This is the

[nmh] / uip / mhcachesbr.c

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index cf9087b22522984441d1d595457c67a932b318c5..59e27914905c3c5c4ef16021a2faef751c00c2e7 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -12,7 +12,6 @@
 #include <h/signals.h>
 #include <h/md5.h>
 #include <errno.h>
 #include <h/signals.h>
 #include <h/md5.h>
 #include <errno.h>

-#include <setjmp.h>

 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>


@@ -42,13 +41,9 @@ char *cache_public;
 char *cache_private;
 
 
 char *cache_private;
 
 

-/* mhparse.c (OR) mhbuildsbr.c */
-int pidcheck (int);
-

 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);

-int make_intermediates (char *);

 void content_error (char *, CT, char *, ...);
 void flush_errors (void);
 
 void content_error (char *, CT, char *, ...);
 void flush_errors (void);
 


@@ -113,14 +108,6 @@ cache_content (CT ct)
        return;
     }
 
        return;
     }
 

-/* THIS NEEDS TO BE FIXED */
-#if 0
-    if (ct->c_ceopenfnx == openMail) {
-       advise (NULL, "a radish may no know Greek, but I do...");
-       return;
-    }
-#endif
-

     if (find_cache (NULL, wcachesw != CACHE_NEVER ? wcachesw : CACHE_ASK,
                    &cachetype, ct->c_id, cachefile, sizeof(cachefile))
            == NOTOK) {
     if (find_cache (NULL, wcachesw != CACHE_NEVER ? wcachesw : CACHE_ASK,
                    &cachetype, ct->c_id, cachefile, sizeof(cachefile))
            == NOTOK) {


@@ -396,8 +383,9 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
     for (state = FLD;;) {
        int result;
        char *cp, *dp;
     for (state = FLD;;) {
        int result;
        char *cp, *dp;

+       int bufsz = sizeof buf;

 
 

-       switch (state = m_getfld (state, name, buf, sizeof(buf), fp)) {
+       switch (state = m_getfld (state, name, buf, &bufsz, fp)) {

            case FLD:
            case FLDPLUS:
            case FLDEOF:
            case FLD:
            case FLDPLUS:
            case FLDEOF:


@@ -407,7 +395,8 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
                else {
                    cp = add (buf, NULL);
                    while (state == FLDPLUS) {
                else {
                    cp = add (buf, NULL);
                    while (state == FLDPLUS) {

-                       state = m_getfld (state, name, buf, sizeof(buf), fp);
+                       bufsz = sizeof buf;
+                       state = m_getfld (state, name, buf, &bufsz, fp);

                        cp = add (buf, cp);
                    }
                }
                        cp = add (buf, cp);
                    }
                }