X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/fda43c337684641866e4c5890ff3af41cfa72fdd..2bd2ea37d43ab626c0139f1fc4d0bdfb23970b03:/uip/mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index e2bcf392..cf7c53ac 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -32,7 +32,6 @@
 
 
 extern int debugsw;
-extern int verbosw;
 
 extern int listsw;
 extern int rfc934sw;
@@ -42,8 +41,6 @@ extern int contentidsw;
 extern int rcachesw;	/* mhcachesbr.c */
 extern int wcachesw;	/* mhcachesbr.c */
 
-pid_t xpid = 0;
-
 static char prefix[] = "----- =_aaaaaaaaaa";
 
 struct attach_list {
@@ -71,12 +68,12 @@ void free_encoding (CT, int);
 /*
  * static prototypes
  */
-static int init_decoded_content (CT);
+static int init_decoded_content (CT, const char *);
 static void setup_attach_content(CT, char *);
 static char *fgetstr (char *, int, FILE *);
-static int user_content (FILE *, char *, CT *);
+static int user_content (FILE *, char *, CT *, const char *infilename);
 static void set_id (CT, int);
-static int compose_content (CT);
+static int compose_content (CT, int);
 static int scan_content (CT, size_t);
 static int build_headers (CT, int);
 static char *calculate_digest (CT, int);
@@ -124,7 +121,7 @@ static void directive_pop(void)
 
 CT
 build_mime (char *infile, int autobuild, int dist, int directives,
-	    int header_encoding, size_t maxunencoded)
+	    int header_encoding, size_t maxunencoded, int verbose)
 {
     int	compnum, state;
     char buf[BUFSIZ], name[NAMESZ];
@@ -156,7 +153,7 @@ build_mime (char *infile, int autobuild, int dist, int directives,
      * for this part.  We don't really need this, but
      * allocate it to remain consistent.
      */
-    init_decoded_content (ct);
+    init_decoded_content (ct, infile);
 
     /*
      * Parse some of the header fields in the composition
@@ -296,7 +293,6 @@ finish_field:
 	done (1);
     ct->c_type = CT_MULTIPART;
     ct->c_subtype = MULTI_MIXED;
-    ct->c_file = add (infile, NULL);
 
     if ((m = (struct multipart *) calloc (1, sizeof(*m))) == NULL)
 	adios (NULL, "out of memory");
@@ -311,7 +307,7 @@ finish_field:
 	struct part *part;
 	CT p;
 
-	if (user_content (in, buf, &p) == DONE) {
+	if (user_content (in, buf, &p, infile) == DONE) {
 	    admonish (NULL, "ignoring spurious #end");
 	    continue;
 	}
@@ -342,7 +338,7 @@ finish_field:
 	if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
 	    adios(NULL, "out of memory");
 
-	init_decoded_content(p);
+	init_decoded_content(p, infile);
 
 	/*
 	 * Initialize our content structure based on the filename,
@@ -376,7 +372,7 @@ finish_field:
 	if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
 	    adios(NULL, "out of memory");
 
-	init_decoded_content(p);
+	init_decoded_content(p, infile);
 
 	if (get_ctinfo ("text/plain", p, 0) == NOTOK)
 	    done (1);
@@ -384,7 +380,6 @@ finish_field:
 	p->c_type = CT_TEXT;
 	p->c_subtype = TEXT_PLAIN;
 	p->c_encoding = CE_7BIT;
-	p->c_file = getcpy(infile);
 	/*
 	 * Sigh.  ce_file contains the "decoded" contents of this part.
 	 * So this seems like the best option available since we're going
@@ -439,7 +434,7 @@ finish_field:
      * Fill out, or expand directives.  Parse and execute
      * commands specified by profile composition strings.
      */
-    compose_content (ct);
+    compose_content (ct, verbose);
 
     if ((cp = strchr(prefix, 'a')) == NULL)
 	adios (NULL, "internal error(4)");
@@ -474,11 +469,13 @@ finish_field:
  */
 
 static int
-init_decoded_content (CT ct)
+init_decoded_content (CT ct, const char *filename)
 {
     ct->c_ceopenfnx  = open7Bit;	/* since unencoded */
     ct->c_ceclosefnx = close_encoding;
     ct->c_cesizefnx  = NULL;		/* since unencoded */
+    ct->c_encoding = CE_7BIT;		/* Seems like a reasonable default */
+    ct->c_file = add(filename, NULL);
 
     return OK;
 }
@@ -528,7 +525,7 @@ fgetstr (char *s, int n, FILE *stream)
  */
 
 static int
-user_content (FILE *in, char *buf, CT *ctp)
+user_content (FILE *in, char *buf, CT *ctp, const char *infilename)
 {
     int	extrnal, vrsn;
     char *cp, **ap;
@@ -552,7 +549,7 @@ user_content (FILE *in, char *buf, CT *ctp)
     *ctp = ct;
 
     /* allocate basic structure for handling decoded content */
-    init_decoded_content (ct);
+    init_decoded_content (ct, infilename);
     ce = &ct->c_cefile;
 
     ci = &ct->c_ctinfo;
@@ -915,7 +912,7 @@ use_forw:
 
 		    if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
 			adios (NULL, "out of memory");
-		    init_decoded_content (p);
+		    init_decoded_content (p, infilename);
 		    pe = &p->c_cefile;
 		    if (get_ctinfo ("message/rfc822", p, 0) == NOTOK)
 			done (1);
@@ -997,7 +994,7 @@ use_forw:
 	    struct part *part;
 	    CT p;
 
-	    if (user_content (in, buffer, &p) == DONE) {
+	    if (user_content (in, buffer, &p, infilename) == DONE) {
 		if (!m->mp_parts)
 		    adios (NULL, "empty \"#begin ... #end\" sequence");
 		return OK;
@@ -1049,7 +1046,7 @@ set_id (CT ct, int top)
  */
 
 static int
-compose_content (CT ct)
+compose_content (CT ct, int verbose)
 {
     CE ce = &ct->c_cefile;
 
@@ -1075,7 +1072,7 @@ compose_content (CT ct)
 
 	    sprintf (pp, "%d", partnum);
 	    p->c_partno = add (partnam, NULL);
-	    if (compose_content (p) == NOTOK)
+	    if (compose_content (p, verbose) == NOTOK)
 		return NOTOK;
 	}
 
@@ -1212,7 +1209,7 @@ raw:
 		}
 	    }
 
-	    if (verbosw)
+	    if (verbose)
 		printf ("composing content %s/%s from command\n\t%s\n",
 			ci->ci_type, ci->ci_subtype, buffer);
 
@@ -1363,15 +1360,17 @@ scan_content (CT ct, size_t maxunencoded)
 	break;
 
 	case CT_MESSAGE:
-	    check8bit = 0;
 	    checklinelen = 0;
 	    checklinespace = 0;
 
 	    /* don't check anything for message/external */
-	    if (ct->c_subtype == MESSAGE_EXTERNAL)
+	    if (ct->c_subtype == MESSAGE_EXTERNAL) {
 		checkboundary = 0;
-	    else
+		check8bit = 0;
+	    } else {
 		checkboundary = 1;
+		check8bit = 1;
+	    }
 	    break;
 
 	case CT_AUDIO:
@@ -1408,6 +1407,7 @@ scan_content (CT ct, size_t maxunencoded)
 		    if (!isascii ((unsigned char) *cp)) {
 			contains8bit = 1;
 			check8bit = 0;	/* no need to keep checking */
+			break;
 		    }
 		}
 	    }
@@ -1469,7 +1469,7 @@ scan_content (CT ct, size_t maxunencoded)
 	    CI ci = &ct->c_ctinfo;
 
 	    add_param(&ci->ci_first_pm, &ci->ci_last_pm, "charset",
-	    	      contains8bit ? write_charset_8bit() : "us-ascii");
+	    	      contains8bit ? write_charset_8bit() : "us-ascii", 0);
 	    t->tx_charset = CHARSET_SPECIFIED;
 	}
     }
@@ -1501,7 +1501,7 @@ scan_content (CT ct, size_t maxunencoded)
 	    break;
 
 	case CT_MESSAGE:
-	    ct->c_encoding = CE_7BIT;
+	    ct->c_encoding = contains8bit ? CE_8BIT : CE_7BIT;
 	    break;
 
 	case CT_AUDIO:
@@ -1537,7 +1537,7 @@ build_headers (CT ct, int header_encoding)
 	static int level = 0;	/* store nesting level */
 
 	snprintf (buffer, sizeof(buffer), "%s%d", prefix, level++);
-	add_param(&ci->ci_first_pm, &ci->ci_last_pm, "boundary", buffer);
+	add_param(&ci->ci_first_pm, &ci->ci_last_pm, "boundary", buffer, 0);
     }
 
     /*
@@ -1663,9 +1663,6 @@ skip_headers:
 	break;
 
     case CE_8BIT:
-	if (ct->c_type == CT_MESSAGE)
-	    adios (NULL, "internal error, invalid encoding");
-
 	np = add (ENCODING_FIELD, NULL);
 	vp = concat (" ", "8bit", "\n", NULL);
 	add_header (ct, np, vp);
@@ -1908,7 +1905,7 @@ setup_attach_content(CT ct, char *filename)
 
     if (pm == NULL)
     	add_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm,
-		  "name", simplename);
+		  "name", simplename, 0);
 
     ct->c_descr = getcpy(simplename);
     ct->c_descr = add("\n", ct->c_descr);
@@ -1927,5 +1924,5 @@ setup_attach_content(CT ct, char *filename)
     	ct->c_dispo_type = getcpy("attachment");
     }
 
-    add_param(&ct->c_dispo_first, &ct->c_dispo_last, "filename", simplename);
+    add_param(&ct->c_dispo_first, &ct->c_dispo_last, "filename", simplename, 0);
 }