Simplified m_strn() per Ralph's suggestions.

[nmh] / uip / forwsbr.c

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index 90838e2418dffd06a803c78111067bc040ea2d96..4f76c3864a538160d625f7cb5e6a81c3f2443787 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,10 +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 *line, tmpfil[BUFSIZ], name[NAMESZ], **ap;
+    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;
@@ -178,18 +178,18 @@ finished:
        adios(NULL, "unable to create temporary file in %s", get_temp_dir());
     }
     strncpy (tmpfil, cp, sizeof(tmpfil));
-    unlink (tmpfil);
+    (void) m_unlink (tmpfil);
     if ((in = dup (fileno (tmp))) == NOTOK)
        adios ("dup", "unable to");
 
-    line = mh_xmalloc ((unsigned) fmtsize);
-    fmt_scan (fmt, line, fmtsize - 1, fmtsize, dat, NULL);
-    fputs (line, tmp);
-    free (line);
+    line = charstring_create (fmtsize);
+    fmt_scan (fmt, line, fmtsize, dat, NULL);
+    fputs (charstring_buffer (line), tmp);
+    charstring_free (line);
     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