[bug #4302] errno is not always an extern int

[mmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 1839a15..0bb56da 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -3,6 +3,10 @@
  * mhparse.c -- routines to parse the contents of MIME messages
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
@@ -12,8 +16,8 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
-#include <zotnet/tws/tws.h>
+#include <h/mts.h>
+#include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 
@@ -22,7 +26,6 @@
 #endif
 
 
-extern int errno;
 extern int debugsw;
 
 extern int endian;     /* mhmisc.c     */
@@ -177,7 +180,7 @@ static struct str2init str2ces[] = {
     { "quoted-printable", CE_QUOTED,   InitQuoted },
     { "8bit",            CE_8BIT,      Init7Bit },
     { "7bit",            CE_7BIT,      Init7Bit },
-    { "binary",                  CE_BINARY,    NULL },
+    { "binary",                  CE_BINARY,    Init7Bit },
     { NULL,              CE_EXTENSION, NULL },  /* these two must be last! */
     { NULL,              CE_UNKNOWN,   NULL },
 };
@@ -205,8 +208,7 @@ pidcheck (int status)
 
     fflush (stdout);
     fflush (stderr);
-    done (1);
-    /* NOTREACHED */
+    return done (1);
 }
 
 
@@ -985,6 +987,7 @@ InitMultiPart (CT ct)
      * Check for "boundary" parameter, which is
      * required for multipart messages.
      */
+    bp = 0;
     for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
        if (!strcasecmp (*ap, "boundary")) {
            bp = *ep;
@@ -1194,9 +1197,9 @@ InitMessage (CT ct)
     struct k2v *kv;
     CI ci = &ct->c_ctinfo;
 
-    if (ct->c_encoding != CE_7BIT) {
+    if ((ct->c_encoding != CE_7BIT) && (ct->c_encoding != CE_8BIT)) {
        admonish (NULL,
-                 "\"%s/%s\" type in message %s should be encoded in 7bit",
+                 "\"%s/%s\" type in message %s should be encoded in 7bit or 8bit",
                  ci->ci_type, ci->ci_subtype, ct->c_file);
        return NOTOK;
     }
@@ -1569,6 +1572,8 @@ openBase64 (CT ct, char **file)
     unsigned long bits;
     unsigned char value, *b, *b1, *b2, *b3;
     char *cp, *ep, buffer[BUFSIZ];
+    /* sbeck -- handle prefixes */
+    CI ci;
     CE ce;
     MD5_CTX mdContext;
 
@@ -1599,6 +1604,19 @@ openBase64 (CT ct, char **file)
        ce->ce_unlink = 0;
     }
 
+    /* sbeck@cise.ufl.edu -- handle suffixes */
+    ci = &ct->c_ctinfo;
+    snprintf (buffer, sizeof(buffer), "%s-suffix-%s/%s",
+              invo_name, ci->ci_type, ci->ci_subtype);
+    cp = context_find (buffer);
+    if (cp == NULL || *cp == '\0') {
+        snprintf (buffer, sizeof(buffer), "%s-suffix-%s", invo_name,
+                  ci->ci_type);
+        cp = context_find (buffer);
+    }
+    if (cp != NULL && *cp != '\0')
+        ce->ce_file = add (cp, ce->ce_file);
+
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
        content_error (ce->ce_file, ct, "unable to fopen for reading/writing");
        return NOTOK;
@@ -1768,6 +1786,8 @@ openQuoted (CT ct, char **file)
     char buffer[BUFSIZ];
     unsigned char mask;
     CE ce;
+    /* sbeck -- handle prefixes */
+    CI ci;
     MD5_CTX mdContext;
 
     ce = ct->c_cefile;
@@ -1792,6 +1812,24 @@ openQuoted (CT ct, char **file)
        ce->ce_unlink = 0;
     }
 
+    /* sbeck@cise.ufl.edu -- handle suffixes */
+    ci = &ct->c_ctinfo;
+    snprintf (buffer, sizeof(buffer), "%s-suffix-%s/%s",
+              invo_name, ci->ci_type, ci->ci_subtype);
+    cp = context_find (buffer);
+    if (cp == NULL || *cp == '\0') {
+        snprintf (buffer, sizeof(buffer), "%s-suffix-%s", invo_name,
+                  ci->ci_type);
+        cp = context_find (buffer);
+    }
+    if (cp != NULL && *cp != '\0')
+        ce->ce_file = add (cp, ce->ce_file);
+
+    if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
+       content_error (ce->ce_file, ct, "unable to fopen for reading/writing");
+       return NOTOK;
+    }
+
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
        content_error (ce->ce_file, ct, "unable to fopen for reading/writing");
        return NOTOK;
@@ -1966,6 +2004,9 @@ open7Bit (CT ct, char **file)
 {
     int        cc, fd, len;
     char buffer[BUFSIZ];
+    /* sbeck -- handle prefixes */
+    char *cp;
+    CI ci;
     CE ce;
 
     ce = ct->c_cefile;
@@ -1990,6 +2031,19 @@ open7Bit (CT ct, char **file)
        ce->ce_unlink = 0;
     }
 
+    /* sbeck@cise.ufl.edu -- handle suffixes */
+    ci = &ct->c_ctinfo;
+    snprintf (buffer, sizeof(buffer), "%s-suffix-%s/%s",
+              invo_name, ci->ci_type, ci->ci_subtype);
+    cp = context_find (buffer);
+    if (cp == NULL || *cp == '\0') {
+        snprintf (buffer, sizeof(buffer), "%s-suffix-%s", invo_name,
+                  ci->ci_type);
+        cp = context_find (buffer);
+    }
+    if (cp != NULL && *cp != '\0')
+        ce->ce_file = add (cp, ce->ce_file);
+
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
        content_error (ce->ce_file, ct, "unable to fopen for reading/writing");
        return NOTOK;
@@ -2400,7 +2454,7 @@ losing_ftp:
            goto losing_ftp;
 #endif
 
-    if (cachefile[0])
+    if (cachefile[0]) {
        if (caching)
            chmod (cachefile, cachetype ? m_gmprot () : 0444);
        else {
@@ -2414,7 +2468,7 @@ losing_ftp:
 
                fseek (gp, 0L, SEEK_SET);
 
-               while ((cc = fread (buffer, sizeof(*buffer), sizeof(buffer), gp))
+               while ((cc= fread (buffer, sizeof(*buffer), sizeof(buffer), gp))
                           > 0)
                    fwrite (buffer, sizeof(*buffer), cc, fp);
                fflush (fp);
@@ -2432,6 +2486,7 @@ losing_ftp:
            }
            umask (mask);
        }
+    }
 
     fseek (ce->ce_fp, 0L, SEEK_SET);
     *file = ce->ce_file;