X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..8bd6112f573f6b9e8cc9b93d01a594748a2ef8fb:/uip/forwsbr.c

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index 2a7347ab..7e86244e 100644
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -5,19 +5,23 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/getcpy.h"
+#include "sbr/error.h"
 #include <fcntl.h>
-#include <h/fmt_scan.h>
-#include <h/tws.h>
-#include <h/utils.h>
+#include "h/fmt_scan.h"
+#include "h/tws.h"
+#include "h/utils.h"
+#include "sbr/m_mktemp.h"
+#include "forwsbr.h"
 
 /*
  * Take from replsbr.c - a buffer big enough to read in data header lines
  * in reasonable chunks but not enough to slurp in the whole message
  */
 
-static char msgbuf[256];
-#define COMPFREE(c) mh_xfree(c->c_text)
+static char msgbuf[NMH_BUFSIZ];
+#define COMPFREE(c) free(c->c_text)
 
 /*
  * A list of components we treat as addresses
@@ -53,7 +57,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
@@ -86,9 +90,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:
@@ -102,13 +107,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;
 
@@ -119,7 +124,7 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
 	    	goto finished;
 
 	    default:
-	    	adios(NULL, "m_getfld() returned %d", state);
+	    	die("m_getfld2() returned %d", state);
 	}
     }
 
@@ -174,7 +179,7 @@ finished:
 
     cp = m_mktemp2(NULL, invo_name, NULL, &tmp);
     if (cp == NULL) {
-	adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+	die("unable to create temporary file in %s", get_temp_dir());
     }
     strncpy (tmpfil, cp, sizeof(tmpfil));
     (void) m_unlink (tmpfil);
@@ -188,7 +193,7 @@ finished:
     if (fclose (tmp))
 	adios (tmpfil, "error writing");
 
-    lseek (in, (off_t) 0, SEEK_SET);
+    lseek(in, 0, SEEK_SET);
 
     /*
      * Free any component buffers that we allocated