Fix up mhbuild so the character set is always output when needed, even

[nmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 371d0c926567e084418a74dcea4dfd1a40886778..8af26906fe9edfbb38fe2bea9fdd5f4a948e236c 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -1677,7 +1677,7 @@ static int
 openBase64 (CT ct, char **file)
 {
     int        bitno, cc, digested;
-    int fd, len, skip, own_ct_fp = 0;
+    int fd, len, skip, own_ct_fp = 0, text = ct->c_type == CT_TEXT;
     uint32_t bits;
     unsigned char value, b;
     char *cp, *ep, buffer[BUFSIZ];
@@ -1700,12 +1700,6 @@ openBase64 (CT ct, char **file)
     }
 
     if (*file == NULL) {
-       char *tempfile;
-       if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
-           adios(NULL, "unable to create temporary file in %s",
-                 get_temp_dir());
-       }
-       ce->ce_file = add (tempfile, NULL);
        ce->ce_unlink = 1;
     } else {
        ce->ce_file = add (*file, NULL);
@@ -1723,9 +1717,22 @@ openBase64 (CT ct, char **file)
         cp = context_find (buffer);
     }
     if (cp != NULL && *cp != '\0') {
-        if (! ce->ce_unlink) {
-            ce->ce_file = add (cp, ce->ce_file);
-        }
+       if (ce->ce_unlink) {
+           /* Create temporary file with filename extension. */
+           if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
+               adios(NULL, "unable to create temporary file in %s",
+                     get_temp_dir());
+           }
+       } else {
+           ce->ce_file = add (cp, ce->ce_file);
+       }
+    } else if (*file == NULL) {
+       char *tempfile;
+       if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+           adios(NULL, "unable to create temporary file in %s",
+                 get_temp_dir());
+       }
+       ce->ce_file = add (tempfile, NULL);
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
@@ -1789,17 +1796,20 @@ openBase64 (CT ct, char **file)
 test_end:
                    if ((bitno -= 6) < 0) {
                        b = (bits >> 16) & 0xff;
-                       putc ((char) b, ce->ce_fp);
+                       if (!text || b != '\r')
+                           putc ((char) b, ce->ce_fp);
                        if (digested)
                            MD5Update (&mdContext, &b, 1);
                        if (skip < 2) {
                            b = (bits >> 8) & 0xff;
-                           putc ((char) b, ce->ce_fp);
+                           if (! text || b != '\r')
+                               putc ((char) b, ce->ce_fp);
                            if (digested)
                                MD5Update (&mdContext, &b, 1);
                            if (skip < 1) {
                                b = bits & 0xff;
-                               putc ((char) b, ce->ce_fp);
+                               if (! text || b != '\r')
+                                   putc ((char) b, ce->ce_fp);
                                if (digested)
                                    MD5Update (&mdContext, &b, 1);
                            }
@@ -1929,12 +1939,6 @@ openQuoted (CT ct, char **file)
     }
 
     if (*file == NULL) {
-       char *tempfile;
-       if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
-           adios(NULL, "unable to create temporary file in %s",
-                 get_temp_dir());
-       }
-       ce->ce_file = add (tempfile, NULL);
        ce->ce_unlink = 1;
     } else {
        ce->ce_file = add (*file, NULL);
@@ -1952,9 +1956,22 @@ openQuoted (CT ct, char **file)
         cp = context_find (buffer);
     }
     if (cp != NULL && *cp != '\0') {
-        if (! ce->ce_unlink) {
-            ce->ce_file = add (cp, ce->ce_file);
-        }
+       if (ce->ce_unlink) {
+           /* Create temporary file with filename extension. */
+           if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
+               adios(NULL, "unable to create temporary file in %s",
+                     get_temp_dir());
+           }
+       } else {
+           ce->ce_file = add (cp, ce->ce_file);
+       }
+    } else if (*file == NULL) {
+       char *tempfile;
+       if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+           adios(NULL, "unable to create temporary file in %s",
+                 get_temp_dir());
+       }
+       ce->ce_file = add (tempfile, NULL);
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
@@ -2148,12 +2165,6 @@ open7Bit (CT ct, char **file)
     }
 
     if (*file == NULL) {
-       char *tempfile;
-       if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
-           adios(NULL, "unable to create temporary file in %s",
-                 get_temp_dir());
-       }
-       ce->ce_file = add (tempfile, NULL);
        ce->ce_unlink = 1;
     } else {
        ce->ce_file = add (*file, NULL);
@@ -2171,9 +2182,22 @@ open7Bit (CT ct, char **file)
         cp = context_find (buffer);
     }
     if (cp != NULL && *cp != '\0') {
-        if (! ce->ce_unlink) {
-            ce->ce_file = add (cp, ce->ce_file);
-        }
+       if (ce->ce_unlink) {
+           /* Create temporary file with filename extension. */
+           if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
+               adios(NULL, "unable to create temporary file in %s",
+                     get_temp_dir());
+           }
+       } else {
+           ce->ce_file = add (cp, ce->ce_file);
+       }
+    } else if (*file == NULL) {
+       char *tempfile;
+       if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+           adios(NULL, "unable to create temporary file in %s",
+                 get_temp_dir());
+       }
+       ce->ce_file = add (tempfile, NULL);
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {