Replaced boilerplate at beginning of each nmh program with new

[nmh] / uip / forwsbr.c

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index cf043c40b2bbba6d74b7ae7d165913d98debddcd..90838e2418dffd06a803c78111067bc040ea2d96 100644 (file)
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -123,7 +123,6 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
                adios(NULL, "m_getfld() returned %d", state);
        }
     }
                adios(NULL, "m_getfld() returned %d", state);
        }
     }

-    m_getfld_state_destroy (&gstate);

 
     /*
      * Override any components just in case they were included in the
 
     /*
      * Override any components just in case they were included in the


@@ -136,6 +135,7 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
      */
 
 finished:
      */
 
 finished:

+    m_getfld_state_destroy (&gstate);

 
     cptr = fmt_findcomp ("digest");
     if (cptr) {
 
     cptr = fmt_findcomp ("digest");
     if (cptr) {


@@ -174,14 +174,16 @@ finished:
     }
 
     cp = m_mktemp2(NULL, invo_name, NULL, &tmp);
     }
 
     cp = m_mktemp2(NULL, invo_name, NULL, &tmp);

-    if (cp == NULL) adios("forw", "unable to create temporary file");
+    if (cp == NULL) {
+       adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+    }

     strncpy (tmpfil, cp, sizeof(tmpfil));
     unlink (tmpfil);
     if ((in = dup (fileno (tmp))) == NOTOK)
        adios ("dup", "unable to");
 
     line = mh_xmalloc ((unsigned) fmtsize);
     strncpy (tmpfil, cp, sizeof(tmpfil));
     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);
+    fmt_scan (fmt, line, fmtsize - 1, fmtsize, dat, NULL);

     fputs (line, tmp);
     free (line);
     if (fclose (tmp))
     fputs (line, tmp);
     free (line);
     if (fclose (tmp))