test/inc/test-eom-align: Fix tests; they've never worked.

[nmh] / uip / forwsbr.c

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index 97d1f3d328ddcba3c3aa0cf5cce4b4e221dabc24..a412d9a484321d229c518ddb9a64dd84d71656c3 100644 (file)
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * forwsbr.c -- subroutine to build a draft from a component file
+/* forwsbr.c -- subroutine to build a draft from a component file
  *
  * This code is Copyright (c) 2012, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -12,14 +10,15 @@
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.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) if (c->c_text) free(c->c_text)
+static char msgbuf[NMH_BUFSIZ];
+#define COMPFREE(c) mh_xfree(c->c_text)
 
 /*
  * A list of components we treat as addresses
@@ -48,11 +47,11 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
     int        in;
     int fmtsize, state;
     int i;
-    register char *nfs;
+    char *nfs;
     char tmpfil[BUFSIZ], name[NAMESZ], **ap;
     charstring_t line;
     FILE *tmp;
-    register struct comp *cptr;
+    struct comp *cptr;
     struct format *fmt;
     char *cp = NULL;
     m_getfld_state_t gstate = 0;