X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1d293e00e4411d584483411cfebe88997057ae0c..cfb444d37fc236a9fdac369cbcf2a5bfc37a33f5:/uip/mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index e0c3e590..501bb88b 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * mhbuildsbr.c -- routines to expand/translate MIME composition files
+/* mhbuildsbr.c -- routines to expand/translate MIME composition files
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -20,9 +18,15 @@
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
+#include <h/fmt_scan.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
+#include "../sbr/message_id.h"
+#include "../sbr/mime_type.h"
+#include "mhfree.h"
+#include "mhshowsbr.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
@@ -36,10 +40,6 @@ extern int listsw;
 extern int rfc934sw;
 extern int contentidsw;
 
-/* cache policies */
-extern int rcachesw;	/* mhcachesbr.c */
-extern int wcachesw;	/* mhcachesbr.c */
-
 static char prefix[] = "----- =_aaaaaaaaaa";
 
 struct attach_list {
@@ -61,12 +61,6 @@ void content_error (char *, CT, char *, ...);
 /* mhcachesbr.c */
 int find_cache (CT, int, int *, char *, char *, int);
 
-/* mhfree.c */
-extern CT *cts;
-void freects_done (int) NORETURN;
-void free_ctinfo (CT);
-void free_encoding (CT, int);
-
 /*
  * static prototypes
  */
@@ -133,7 +127,7 @@ build_mime (char *infile, int autobuild, int dist, int directives,
 	    int header_encoding, size_t maxunencoded, int verbose)
 {
     int	compnum, state;
-    char buf[BUFSIZ], name[NAMESZ];
+    char buf[NMH_BUFSIZ], name[NAMESZ];
     char *cp, *np, *vp;
     struct multipart *m;
     struct part **pp;
@@ -337,7 +331,7 @@ finish_field:
 
 	case BODY:
 	    fseek (in, (long) (-strlen (buf)), SEEK_CUR);
-	    /* FALLTHRU */
+	    break;
 	case FILEEOF:
 	    break;
 
@@ -377,7 +371,7 @@ finish_field:
     }
 
     /*
-     * We initally assume we will find multiple contents in the
+     * We initially assume we will find multiple contents in the
      * draft.  So create a multipart/mixed content to hold everything.
      * We can remove this later, if it is not needed.
      */
@@ -651,7 +645,7 @@ user_content (FILE *in, char *buf, CT *ctp, const char *infilename)
 {
     int	extrnal, vrsn;
     char *cp, **ap;
-    char buffer[BUFSIZ];
+    char buffer[NMH_BUFSIZ];
     struct multipart *m;
     struct part **pp;
     struct stat st;
@@ -1214,7 +1208,7 @@ compose_content (CT ct, int verbose)
 	if (listsw) {
 	    ct->c_end = (partnum = strlen (prefix) + 2) + 2;
 	    if (ct->c_rfc934)
-		ct->c_end += 1;
+		ct->c_end++;
 
 	    for (part = m->mp_parts; part; part = part->mp_next)
 		ct->c_end += part->mp_part->c_end + partnum;
@@ -1774,7 +1768,7 @@ skip_headers:
      */
     if (checksw) {
 	np = mh_xstrdup(MD5_FIELD);
-	vp = calculate_digest (ct, (ct->c_encoding == CE_QUOTED) ? 1 : 0);
+        vp = calculate_digest (ct, ct->c_encoding == CE_QUOTED);
 	add_header (ct, np, vp);
     }
 
@@ -1979,7 +1973,7 @@ setup_attach_content(CT ct, char *filename)
 
     /*
      * Parse the Content-Type.  get_ctinfo() parses MIME parameters, but
-     * since we're just feeding it a MIME type we have to add those ourself.
+     * since we're just feeding it a MIME type we have to add those ourselves.
      * Map that to a valid content-type label and call any initialization
      * function.
      */
@@ -2068,7 +2062,7 @@ set_disposition (CT ct) {
 		"continuing...", invo_name,
 		ct->c_ctinfo.ci_type,
 		ct->c_ctinfo.ci_subtype ? "/" : "",
-		ct->c_ctinfo.ci_subtype ? ct->c_ctinfo.ci_subtype : "",
+		FENDNULL(ct->c_ctinfo.ci_subtype),
 		cp);
         }
 
@@ -2080,7 +2074,7 @@ set_disposition (CT ct) {
 
 /*
  * Set text content charset if it was unspecified.  contains8bit
- * selctions:
+ * selections:
  * 0: content does not contain 8-bit characters
  * 1: content contains 8-bit characters
  * -1: ignore content and use user's locale to determine charset
@@ -2233,7 +2227,7 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m,
     /* reply_file is used to pass the output of the convert. */
     reply_file = getcpy (m_mktemp2 (NULL, invo_name, NULL, NULL));
     convert_command =
-        concat (convert, " ", argstring ? argstring : "", " >", reply_file,
+        concat (convert, " ", FENDNULL(argstring), " >", reply_file,
                 NULL);
 
     /* Convert here . . . */