m_getfld() now supports interleaving calls with

[nmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index f5a5983adadc3b56d341c9efbc5ee0709f4143a2..ea5400e07ed2194fb50e84b37075e7ed9011de48 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -262,7 +262,6 @@ get_content (FILE *in, char *file, int toplevel)
     char *np, *vp;
     CT ct;
     HF hp;
     char *np, *vp;
     CT ct;
     HF hp;

-    long filepos;

 
     /* allocate the content structure */
     if (!(ct = (CT) calloc (1, sizeof(*ct))))
 
     /* allocate the content structure */
     if (!(ct = (CT) calloc (1, sizeof(*ct))))


@@ -270,7 +269,7 @@ get_content (FILE *in, char *file, int toplevel)
 
     ct->c_fp = in;
     ct->c_file = add (file, NULL);
 
     ct->c_fp = in;
     ct->c_file = add (file, NULL);

-    ct->c_begin = (filepos = ftell (ct->c_fp)) + 1;
+    ct->c_begin = ftell (ct->c_fp) + 1;

 
     /*
      * Parse the header fields for this
 
     /*
      * Parse the header fields for this


@@ -283,7 +282,6 @@ get_content (FILE *in, char *file, int toplevel)
        case FLDPLUS:
        case FLDEOF:
            compnum++;
        case FLDPLUS:
        case FLDEOF:
            compnum++;

-           filepos += bufsz;

 
            /* get copies of the buffers */
            np = add (name, NULL);
 
            /* get copies of the buffers */
            np = add (name, NULL);


@@ -301,20 +299,18 @@ get_content (FILE *in, char *file, int toplevel)
 
            /* continue, if this isn't the last header field */
            if (state != FLDEOF) {
 
            /* continue, if this isn't the last header field */
            if (state != FLDEOF) {

-               ct->c_begin = filepos + 1;
+               ct->c_begin = ftell (in) + 1;

                continue;
            }
            /* else fall... */
 
        case BODY:
        case BODYEOF:
                continue;
            }
            /* else fall... */
 
        case BODY:
        case BODYEOF:

-           filepos += bufsz;
-           ct->c_begin = filepos - strlen (buf);
+           ct->c_begin = ftell (in) - strlen (buf);

            break;
 
        case FILEEOF:
            break;
 
        case FILEEOF:

-           filepos += bufsz;
-           ct->c_begin = filepos;
+           ct->c_begin = ftell (in);

            break;
 
        case LENERR:
            break;
 
        case LENERR: