X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3b6170b27ba8fedbb4d67d2842bfaa38d4417962..0b7286788a95dd854d1826b8493eda431d8e8aac:/uip/forwsbr.c

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index 775c8aeb..6978d183 100644
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -5,12 +5,14 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.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
@@ -18,7 +20,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
@@ -121,7 +123,7 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
 	    	goto finished;
 
 	    default:
-	    	adios(NULL, "m_getfld2() returned %d", state);
+	    	die("m_getfld2() returned %d", state);
 	}
     }
 
@@ -176,7 +178,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);