Document the changes made to mhshow.

[nmh] / uip / mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 0077f6dafd8dbbd144d3be92915c165245654cf1..6186cfe4244eb18f8933312faf498e086eb40c0d 100644 (file)
--- 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;
        }
 
@@ -1164,7 +1161,7 @@ compose_content (CT ct)
 
                        for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
                            snprintf (bp, buflen, "%s%s=\"%s\"", s,
-                                     pm->pm_name, pm->pm_value);
+                                     pm->pm_name, get_param_value(pm, '?'));
                            len = strlen (bp);
                            bp += len;
                            buflen -= len;
@@ -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;
        }
     }
@@ -1528,7 +1525,6 @@ build_headers (CT ct, int header_encoding)
     int        cc, mailbody, extbody, len;
     char *np, *vp, buffer[BUFSIZ];
     CI ci = &ct->c_ctinfo;
-    PM pm;
 
     /*
      * If message is type multipart, then add the multipart
@@ -1538,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);
     }
 
     /*
@@ -1568,59 +1564,16 @@ build_headers (CT ct, int header_encoding)
      * Append the attribute/value pairs to
      * the end of the Content-Type line.
      */
-    for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
-       if (mailbody && !strcasecmp (pm->pm_name, "body"))
-           continue;
-
-       vp = add (";", vp);
-       len++;
-
-       /*
-        * According to RFC 2017, if we have a URL longer than 40 characters
-        * we have to break it across multiple lines
-        */
-
-       if (extbody && strcasecmp (pm->pm_name, "url") == 0) {
-           char *value = pm->pm_value;
-
-           /* 7 here refers to " url=\"\"" */
-           if (len + 1 + (cc = (min(MAXURLTOKEN, strlen(value)) + 7)) >=
-                                                               CPERLIN) {
-               vp = add ("\n\t", vp);
-               len = 8;
-           } else {
-               vp = add (" ", vp);
-               len++;
-           }
 
-           vp = add ("url=\"", vp);
-           len += 5;
+    if (ci->ci_first_pm) {
+       char *s = output_params(len, ci->ci_first_pm, &len, mailbody);
 
-           while (strlen(value) > MAXURLTOKEN) {
-               strncpy(buffer, value, MAXURLTOKEN);
-               buffer[MAXURLTOKEN] = '\0';
-               vp = add (buffer, vp);
-               vp = add ("\n\t", vp);
-               value += MAXURLTOKEN;
-               len = 8;
-           }
+       if (!s)
+           adios(NULL, "Internal error: failed outputting Content-Type "
+                 "parameters");
 
-           vp = add (value, vp);
-           vp = add ("\"", vp);
-           len += strlen(value) + 1;
-           continue;
-       }
-
-       snprintf (buffer, sizeof(buffer), "%s=\"%s\"", pm->pm_name, pm->pm_value);
-       if (len + 1 + (cc = strlen (buffer)) >= CPERLIN) {
-           vp = add ("\n\t", vp);
-           len = 8;
-       } else {
-           vp = add (" ", vp);
-           len++;
-       }
-       vp = add (buffer, vp);
-       len += cc;
+       vp = add (s, vp);
+       free(s);
     }
 
     /*
@@ -1672,7 +1625,7 @@ build_headers (CT ct, int header_encoding)
     } else if (ct->c_dispo_type) {
        vp = concat (" ", ct->c_dispo_type, NULL);
        len = strlen(DISPO_FIELD) + strlen(vp) + 1;
-       np = output_params(len, ct->c_dispo_first, NULL);
+       np = output_params(len, ct->c_dispo_first, NULL, 0);
        vp = add(np, vp);
        vp = add("\n", vp);
        if (np)
@@ -1952,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);
@@ -1971,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);
 }