X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/92c3b05ef3e582d64b3cecfc261fdd66ef13a4ef..62b9266aa31b2baced3252987b256b4e43ec9573:/uip/forwsbr.c?ds=sidebyside

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index 1ae630d5..1b6a92cb 100644
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -5,12 +5,18 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/fmt_new.h"
+#include "sbr/dtime.h"
+#include "sbr/m_getfld.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
@@ -61,7 +67,7 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
      */
 
     if ((tmp = fopen(inputfile, "r")) == NULL)
-    	adios (inputfile, "Unable to open");
+	adios (inputfile, "Unable to open");
 
     /* Get new format string */
     nfs = new_fs (form, NULL, NULL);
@@ -94,7 +100,7 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
 	switch (state) {
 	    case FLD:
 	    case FLDPLUS:
-	    	/*
+		/*
 		 * If we find a component that we're interested in, save
 		 * a copy.  We don't do all of that weird buffer switching
 		 * that replout does.
@@ -118,10 +124,10 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
 	    case FMTERR:
 	    case BODY:
 	    case FILEEOF:
-	    	goto finished;
+		goto finished;
 
 	    default:
-	    	adios(NULL, "m_getfld2() returned %d", state);
+		die("m_getfld2() returned %d", state);
 	}
     }
 
@@ -140,43 +146,43 @@ finished:
 
     cptr = fmt_findcomp ("digest");
     if (cptr) {
-    	COMPFREE(cptr);
+	COMPFREE(cptr);
 	cptr->c_text = getcpy(digest);
     }
     cptr = fmt_findcomp ("nmh-date");
     if (cptr) {
-    	COMPFREE(cptr);
+	COMPFREE(cptr);
 	cptr->c_text = getcpy(dtimenow (0));
     }
     cptr = fmt_findcomp ("nmh-from");
     if (cptr) {
-    	COMPFREE(cptr);
+	COMPFREE(cptr);
 	cptr->c_text = getcpy(from);
     }
     cptr = fmt_findcomp ("nmh-to");
     if (cptr) {
-    	COMPFREE(cptr);
+	COMPFREE(cptr);
 	cptr->c_text = getcpy(to);
     }
     cptr = fmt_findcomp ("nmh-cc");
     if (cptr) {
-    	COMPFREE(cptr);
+	COMPFREE(cptr);
 	cptr->c_text = getcpy(cc);
     }
     cptr = fmt_findcomp ("nmh-subject");
     if (cptr) {
-    	COMPFREE(cptr);
+	COMPFREE(cptr);
 	cptr->c_text = getcpy(subject);
     }
     cptr = fmt_findcomp ("fcc");
     if (cptr) {
-    	COMPFREE(cptr);
+	COMPFREE(cptr);
 	cptr->c_text = getcpy(fcc);
     }
 
     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);