inc/test-eom-align: Create test mboxes in less steps.

[nmh] / uip / forwsbr.c

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index 4f76c3864a538160d625f7cb5e6a81c3f2443787..1ae630d5889c9974877c6dd078ae38ddd50e681b 100644 (file)
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -10,7 +10,7 @@
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/utils.h>
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"
 
 /*
  * Take from replsbr.c - a buffer big enough to read in data header lines
@@ -18,7 +18,7 @@
  */
 
 static char msgbuf[NMH_BUFSIZ];
-#define COMPFREE(c) mh_xfree(c->c_text)
+#define COMPFREE(c) free(c->c_text)
 
 /*
  * A list of components we treat as addresses
@@ -54,7 +54,7 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
     struct comp *cptr;
     struct format *fmt;
     char *cp = NULL;
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
 
     /*
      * Open the message we'll be scanning for components
@@ -87,9 +87,10 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
      * these routines?
      */
 
+    gstate = m_getfld_state_init(tmp);
     for (;;) {
        int msg_count = sizeof msgbuf;
-       state = m_getfld (&gstate, name, msgbuf, &msg_count, tmp);
+       state = m_getfld2(&gstate, name, msgbuf, &msg_count);
        switch (state) {
            case FLD:
            case FLDPLUS:
@@ -103,13 +104,13 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
                if (i != -1) {
                    while (state == FLDPLUS) {
                        msg_count = sizeof msgbuf;
-                       state = m_getfld (&gstate, name, msgbuf, &msg_count, tmp);
+                       state = m_getfld2(&gstate, name, msgbuf, &msg_count);
                        fmt_appendcomp(i, name, msgbuf);
                    }
                }
                while (state == FLDPLUS) {
                    msg_count = sizeof msgbuf;
-                   state = m_getfld (&gstate, name, msgbuf, &msg_count, tmp);
+                   state = m_getfld2(&gstate, name, msgbuf, &msg_count);
                }
                break;
 
@@ -120,7 +121,7 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
                goto finished;
 
            default:
-               adios(NULL, "m_getfld() returned %d", state);
+               adios(NULL, "m_getfld2() returned %d", state);
        }
     }