Remove msh(1).

[nmh] / uip / mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 555e3b5c673d9fe70cac83acd493a09c5f71badb..cf7c53ac8bf972a1e955f436c5bfa27d0263c121 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -41,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 {
@@ -70,10 +68,10 @@ 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, int);
 static int scan_content (CT, size_t);
@@ -155,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
@@ -295,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");
@@ -310,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;
        }
@@ -341,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,
@@ -375,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);
@@ -383,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
@@ -473,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;
 }
@@ -527,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;
@@ -551,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;
@@ -914,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);
@@ -996,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;
@@ -1362,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:
@@ -1407,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;
                    }
                }
            }
@@ -1500,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:
@@ -1662,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);