Add a new (but incomplete) test for mhbuild's new functionality.

[nmh] / uip / mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 3cb5f5a6099941f30d71cee21a9973a4830ab15a..b2949c3905c01bc5c54cd723388f86fe93cae4ee 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -42,12 +42,6 @@ extern int contentidsw;
 extern int rcachesw;   /* mhcachesbr.c */
 extern int wcachesw;   /* mhcachesbr.c */
 
 extern int rcachesw;   /* mhcachesbr.c */
 extern int wcachesw;   /* mhcachesbr.c */
 

-/*
- * Directory to place tmp files.  This must
- * be set before these routines are called.
- */
-char *tmp;
-

 pid_t xpid = 0;
 
 static char prefix[] = "----- =_aaaaaaaaaa";
 pid_t xpid = 0;
 
 static char prefix[] = "----- =_aaaaaaaaaa";


@@ -83,7 +77,7 @@ 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 user_content (FILE *, char *, CT *);
 static void set_id (CT, int);
 static int compose_content (CT);

-static int scan_content (CT);
+static int scan_content (CT, size_t);

 static int build_headers (CT);
 static char *calculate_digest (CT, int);
 
 static int build_headers (CT);
 static char *calculate_digest (CT, int);
 


@@ -129,7 +123,8 @@ static void directive_pop(void)
  */
 
 CT
  */
 
 CT

-build_mime (char *infile, int autobuild, int directives, int header_encoding)
+build_mime (char *infile, int autobuild, int dist, int directives,
+           int header_encoding, size_t maxunencoded)

 {
     int        compnum, state;
     char buf[BUFSIZ], name[NAMESZ];
 {
     int        compnum, state;
     char buf[BUFSIZ], name[NAMESZ];


@@ -236,7 +231,9 @@ build_mime (char *infile, int autobuild, int directives, int header_encoding)
 
                entry = mh_xmalloc(sizeof(*entry));
                entry->filename = getcpy(s);
 
                entry = mh_xmalloc(sizeof(*entry));
                entry->filename = getcpy(s);

+               entry->next = NULL;

                free(vp);
                free(vp);

+

                if (attach_tail) {
                    attach_tail->next = entry;
                    attach_tail = entry;
                if (attach_tail) {
                    attach_tail->next = entry;
                    attach_tail = entry;


@@ -283,9 +280,12 @@ finish_field:
      * Now add the MIME-Version header field
      * to the list of header fields.
      */
      * Now add the MIME-Version header field
      * to the list of header fields.
      */

-    np = add (VRSN_FIELD, NULL);
-    vp = concat (" ", VRSN_VALUE, "\n", NULL);
-    add_header (ct, np, vp);
+
+    if (! dist) {
+       np = add (VRSN_FIELD, NULL);
+       vp = concat (" ", VRSN_VALUE, "\n", NULL);
+       add_header (ct, np, vp);
+    }

 
     /*
      * We initally assume we will find multiple contents in the
 
     /*
      * We initally assume we will find multiple contents in the


@@ -449,7 +449,7 @@ finish_field:
      * check if prefix for multipart boundary clashes with
      * any of the contents.
      */
      * check if prefix for multipart boundary clashes with
      * any of the contents.
      */

-    while (scan_content (ct) == NOTOK) {
+    while (scan_content (ct, maxunencoded) == NOTOK) {

        if (*cp < 'z') {
            (*cp)++;
         } else {
        if (*cp < 'z') {
            (*cp)++;
         } else {


@@ -461,7 +461,8 @@ finish_field:
     }
 
     /* Build the rest of the header field structures */
     }
 
     /* Build the rest of the header field structures */

-    build_headers (ct);
+    if (! dist)
+       build_headers (ct);

 
     return ct;
 }
 
     return ct;
 }


@@ -573,8 +574,10 @@ user_content (FILE *in, char *buf, CT *ctp)
        FILE *out;
         char *cp;
 
        FILE *out;
         char *cp;
 

-        cp = m_mktemp2(NULL, invo_name, NULL, &out);
-        if (cp == NULL) adios("mhbuildsbr", "unable to create temporary file");
+       if ((cp = m_mktemp2(NULL, invo_name, NULL, &out)) == NULL) {
+           adios("mhbuildsbr", "unable to create temporary file in %s",
+                 get_temp_dir());
+       }

 
        /* use a temp file to collect the plain text lines */
        ce->ce_file = add (cp, NULL);
 
        /* use a temp file to collect the plain text lines */
        ce->ce_file = add (cp, NULL);


@@ -1133,10 +1136,10 @@ compose_content (CT ct)
            if (!(cp = ci->ci_magic))
                adios (NULL, "internal error(5)");
 
            if (!(cp = ci->ci_magic))
                adios (NULL, "internal error(5)");
 

-            tfile = m_mktemp2(NULL, invo_name, NULL, NULL);
-            if (tfile == NULL) {
-                adios("mhbuildsbr", "unable to create temporary file");
-            }
+           if ((tfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+               adios("mhbuildsbr", "unable to create temporary file in %s",
+                     get_temp_dir());
+           }

            ce->ce_file = add (tfile, NULL);
            ce->ce_unlink = 1;
 
            ce->ce_file = add (tfile, NULL);
            ce->ce_unlink = 1;
 


@@ -1275,11 +1278,12 @@ raw:
  */
 
 static int
  */
 
 static int

-scan_content (CT ct)
+scan_content (CT ct, size_t maxunencoded)

 {
     int len;
 {
     int len;

-    int check8bit = 0, contains8bit = 0;  /* check if contains 8bit data                */
-    int checklinelen = 0, linelen = 0;   /* check for long lines                       */
+    int check8bit = 0, contains8bit = 0;  /* check if contains 8bit data */
+    int checklinelen = 0, linelen = 0;  /* check for long lines */ 
+    int checkllinelen = 0; /* check for extra-long lines */

     int checkboundary = 0, boundaryclash = 0; /* check if clashes with multipart boundary   */
     int checklinespace = 0, linespace = 0;  /* check if any line ends with space          */
     char *cp = NULL, buffer[BUFSIZ];
     int checkboundary = 0, boundaryclash = 0; /* check if clashes with multipart boundary   */
     int checklinespace = 0, linespace = 0;  /* check if any line ends with space          */
     char *cp = NULL, buffer[BUFSIZ];


@@ -1301,7 +1305,7 @@ scan_content (CT ct)
        for (part = m->mp_parts; part; part = part->mp_next) {
            CT p = part->mp_part;
 
        for (part = m->mp_parts; part; part = part->mp_next) {
            CT p = part->mp_part;
 

-           if (scan_content (p) == NOTOK)      /* choose encoding for subpart */
+           if (scan_content (p, maxunencoded) == NOTOK)        /* choose encoding for subpart */

                return NOTOK;
 
            /* if necessary, enlarge encoding for enclosing multipart */
                return NOTOK;
 
            /* if necessary, enlarge encoding for enclosing multipart */


@@ -1315,58 +1319,81 @@ scan_content (CT ct)
     }
 
     /*
     }
 
     /*

-     * Decide what to check while scanning this content.
+     * Decide what to check while scanning this content.  Note that
+     * for text content we always check for 8bit characters if the
+     * charset is unspecified, because that controls whether or not the
+     * character set is us-ascii or retrieved from the locale.

      */
      */

-    switch (ct->c_type) {
-    case CT_TEXT:
-       check8bit = 1;
+
+    if (ct->c_type == CT_TEXT) {
+       t = (struct text *) ct->c_ctparams;
+       if (t->tx_charset == CHARSET_UNSPECIFIED)
+           check8bit = 1;
+    }
+
+    switch (ct->c_reqencoding) {
+    case CE_8BIT:
+       checkllinelen = 1;

        checkboundary = 1;
        checkboundary = 1;

-       if (ct->c_subtype == TEXT_PLAIN) {
-           checklinelen = 0;
-           checklinespace = 0;
-       } else {
+       break;
+    case CE_QUOTED:
+       checkboundary = 1;
+       break;
+    case CE_BASE64:
+       break;
+    case CE_UNKNOWN:
+       /* Use the default rules based on content-type */
+       switch (ct->c_type) {
+       case CT_TEXT:
+           checkboundary = 1;

            checklinelen = 1;
            checklinelen = 1;

-           checklinespace = 1;
-       }
+           if (ct->c_subtype == TEXT_PLAIN) {
+               checklinespace = 0;
+           } else {
+               checklinespace = 1;
+           }

        break;
 
        break;
 

-    case CT_APPLICATION:
-       check8bit = 1;
-       checklinelen = 1;
-       checklinespace = 1;
-       checkboundary = 1;
+       case CT_APPLICATION:
+           check8bit = 1;
+           checklinelen = 1;
+           checklinespace = 1;
+           checkboundary = 1;

        break;
 
        break;
 

-    case CT_MESSAGE:
-       check8bit = 0;
-       checklinelen = 0;
-       checklinespace = 0;
+       case CT_MESSAGE:
+           check8bit = 0;
+           checklinelen = 0;
+           checklinespace = 0;

 
 

-       /* don't check anything for message/external */
-       if (ct->c_subtype == MESSAGE_EXTERNAL)
-           checkboundary = 0;
-       else
-           checkboundary = 1;
-       break;
+           /* don't check anything for message/external */
+           if (ct->c_subtype == MESSAGE_EXTERNAL)
+               checkboundary = 0;
+           else
+               checkboundary = 1;
+           break;

 
 

-    case CT_AUDIO:
-    case CT_IMAGE:
-    case CT_VIDEO:
-       /*
-        * Don't check anything for these types,
-        * since we are forcing use of base64.
-        */
-       check8bit = 0;
-       checklinelen = 0;
-       checklinespace = 0;
-       checkboundary = 0;
-       break;
+       case CT_AUDIO:
+       case CT_IMAGE:
+       case CT_VIDEO:
+           /*
+            * Don't check anything for these types,
+            * since we are forcing use of base64, unless
+            * the content-type was specified by a mhbuild directive.
+            */
+           check8bit = 0;
+           checklinelen = 0;
+           checklinespace = 0;
+           checkboundary = 0;
+           break;
+       }

     }
 
     /*
      * Scan the unencoded content
      */
     }
 
     /*
      * Scan the unencoded content
      */

-    if (check8bit || checklinelen || checklinespace || checkboundary) {
+    if (check8bit || checklinelen || checklinespace || checkboundary ||
+       checkllinelen) {

        if ((in = fopen (ce->ce_file, "r")) == NULL)
            adios (ce->ce_file, "unable to open for reading");
        len = strlen (prefix);
        if ((in = fopen (ce->ce_file, "r")) == NULL)
            adios (ce->ce_file, "unable to open for reading");
        len = strlen (prefix);


@@ -1387,11 +1414,23 @@ scan_content (CT ct)
            /*
             * Check line length.
             */
            /*
             * Check line length.
             */

-           if (checklinelen && (strlen (buffer) > CPERLIN + 1)) {
+           if (checklinelen && (strlen (buffer) > maxunencoded + 1)) {

                linelen = 1;
                checklinelen = 0;       /* no need to keep checking */
            }
 
                linelen = 1;
                checklinelen = 0;       /* no need to keep checking */
            }
 

+           /*
+            * RFC 5322 specifies that a message cannot contain a line
+            * greater than 998 characters (excluding the CRLF).  If we
+            * get one of those lines and linelen is NOT set, then abort.
+            */
+
+           if (checkllinelen && !linelen &&
+                                       (strlen(buffer) > MAXLONGLINE + 1)) {
+               adios(NULL, "Line in content exceeds maximum line limit (%d)",
+                     MAXLONGLINE);
+           }
+

            /*
             * Check if line ends with a space.
             */
            /*
             * Check if line ends with a space.
             */


@@ -1419,14 +1458,11 @@ scan_content (CT ct)
     }
 
     /*
     }
 
     /*

-     * Decide which transfer encoding to use.
+     * If the content is text and didn't specify a character set,
+     * we need to figure out which one was used.

      */
      */

-    switch (ct->c_type) {
-    case CT_TEXT:
-       /*
-        * If the text content didn't specify a character
-        * set, we need to figure out which one was used.
-        */
+
+    if (ct->c_type == CT_TEXT) {

        t = (struct text *) ct->c_ctparams;
        if (t->tx_charset == CHARSET_UNSPECIFIED) {
            CI ci = &ct->c_ctinfo;
        t = (struct text *) ct->c_ctparams;
        if (t->tx_charset == CHARSET_UNSPECIFIED) {
            CI ci = &ct->c_ctinfo;


@@ -1447,33 +1483,45 @@ scan_content (CT ct)
            *cp++ = '\0';
            *ep = cp;
        }
            *cp++ = '\0';
            *ep = cp;
        }

+    }

 
 

-       if (contains8bit || linelen || linespace || checksw)
-           ct->c_encoding = CE_QUOTED;
-       else
-           ct->c_encoding = CE_7BIT;
-       break;
+    /*
+     * Decide which transfer encoding to use.
+     */

 
 

-    case CT_APPLICATION:
-       /* For application type, use base64, except when postscript */
-       if (contains8bit || linelen || linespace || checksw)
-           ct->c_encoding = (ct->c_subtype == APPLICATION_POSTSCRIPT)
-               ? CE_QUOTED : CE_BASE64;
-       else
-           ct->c_encoding = CE_7BIT;
-       break;
+    if (ct->c_reqencoding != CE_UNKNOWN)
+       ct->c_encoding = ct->c_reqencoding;
+    else
+       switch (ct->c_type) {
+       case CT_TEXT:
+           if (contains8bit && !linelen && !linespace && !checksw)
+               ct->c_encoding = CE_8BIT;
+           else if (contains8bit || linelen || linespace || checksw)
+               ct->c_encoding = CE_QUOTED;
+           else
+               ct->c_encoding = CE_7BIT;
+           break;

 
 

-    case CT_MESSAGE:
-       ct->c_encoding = CE_7BIT;
-       break;
+       case CT_APPLICATION:
+           /* For application type, use base64, except when postscript */
+           if (contains8bit || linelen || linespace || checksw)
+               ct->c_encoding = (ct->c_subtype == APPLICATION_POSTSCRIPT)
+                   ? CE_QUOTED : CE_BASE64;
+           else
+               ct->c_encoding = CE_7BIT;
+           break;

 
 

-    case CT_AUDIO:
-    case CT_IMAGE:
-    case CT_VIDEO:
-       /* For audio, image, and video contents, just use base64 */
-       ct->c_encoding = CE_BASE64;
-       break;
-    }
+       case CT_MESSAGE:
+           ct->c_encoding = CE_7BIT;
+           break;
+
+       case CT_AUDIO:
+       case CT_IMAGE:
+       case CT_VIDEO:
+           /* For audio, image, and video contents, just use base64 */
+           ct->c_encoding = CE_BASE64;
+           break;
+        }

 
     return (boundaryclash ? NOTOK : OK);
 }
 
     return (boundaryclash ? NOTOK : OK);
 }