X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/96c3d2a022acb59cc2559cd49488da476ee8a3b1..ae9db48d6adafe3a10e6d125ff4720495cc76ee2:/uip/mhparse.c?ds=sidebyside

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 93f1f26f..38188766 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -262,6 +262,7 @@ get_content (FILE *in, char *file, int toplevel)
     char *np, *vp;
     CT ct;
     HF hp;
+    m_getfld_state_t gstate = 0;
 
     /* allocate the content structure */
     if (!(ct = (CT) calloc (1, sizeof(*ct))))
@@ -275,11 +276,12 @@ get_content (FILE *in, char *file, int toplevel)
      * Parse the header fields for this
      * content into a linked list.
      */
-    for (compnum = 1, state = FLD;;) {
-	switch (state = m_getfld (state, name, buf, sizeof(buf), in)) {
+    m_getfld_track_filepos (&gstate, in);
+    for (compnum = 1;;) {
+	int bufsz = sizeof buf;
+	switch (state = m_getfld (&gstate, name, buf, &bufsz, in)) {
 	case FLD:
 	case FLDPLUS:
-	case FLDEOF:
 	    compnum++;
 
 	    /* get copies of the buffers */
@@ -288,22 +290,19 @@ get_content (FILE *in, char *file, int toplevel)
 
 	    /* if necessary, get rest of field */
 	    while (state == FLDPLUS) {
-		state = m_getfld (state, name, buf, sizeof(buf), in);
+		bufsz = sizeof buf;
+		state = m_getfld (&gstate, name, buf, &bufsz, in);
 		vp = add (buf, vp);	/* add to previous value */
 	    }
 
 	    /* Now add the header data to the list */
 	    add_header (ct, np, vp);
 
-	    /* continue, if this isn't the last header field */
-	    if (state != FLDEOF) {
-		ct->c_begin = ftell (in) + 1;
-		continue;
-	    }
-	    /* else fall... */
+	    /* continue, to see if this isn't the last header field */
+	    ct->c_begin = ftell (in) + 1;
+	    continue;
 
 	case BODY:
-	case BODYEOF:
 	    ct->c_begin = ftell (in) - strlen (buf);
 	    break;
 
@@ -322,6 +321,7 @@ get_content (FILE *in, char *file, int toplevel)
 	/* break out of the loop */
 	break;
     }
+    m_getfld_state_destroy (&gstate);
 
     /*
      * Read the content headers.  We will parse the
@@ -2628,7 +2628,7 @@ openFTP (CT ct, char **file)
 
 	fflush (stdout);
 
-	for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
 	    sleep (5);
 	switch (child_id) {
 	    case NOTOK:
@@ -2770,7 +2770,7 @@ openMail (CT ct, char **file)
     vec[vecp++] = e->eb_body;
     vec[vecp] = NULL;
 
-    for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+    for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
 	sleep (5);
     switch (child_id) {
 	case NOTOK: