X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/fda43c337684641866e4c5890ff3af41cfa72fdd..079b426e4e813191dedbf8ba4aa454adf2f0a46d:/uip/mhbuildsbr.c?ds=sidebyside

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index e2bcf392..6186cfe4 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 {
@@ -76,7 +73,7 @@ static void setup_attach_content(CT, char *);
 static char *fgetstr (char *, int, FILE *);
 static int user_content (FILE *, char *, CT *);
 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];
@@ -439,7 +436,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)");
@@ -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);
 
@@ -1469,7 +1466,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;
 	}
     }
@@ -1537,7 +1534,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);
     }
 
     /*
@@ -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);
 }