More fixes (and tests) for the base64 encoder.

[nmh] / h / mime.h

diff --git a/h/mime.h b/h/mime.h
index 1a85b4273e3483db4fc7db0f068568cce1b9dbbd..d152094a8a113fd8e16d128df43df81626d777fc 100644 (file)
--- a/h/mime.h
+++ b/h/mime.h
@@ -1,8 +1,6 @@
 
 /*
  * mime.h -- definitions for MIME
 
 /*
  * mime.h -- definitions for MIME

- *
- * $Id$

  */
 
 #define        VRSN_FIELD      "MIME-Version"
  */
 
 #define        VRSN_FIELD      "MIME-Version"


@@ -14,8 +12,11 @@
 #define        DESCR_FIELD     "Content-Description"
 #define        DISPO_FIELD     "Content-Disposition"
 #define        MD5_FIELD       "Content-MD5"
 #define        DESCR_FIELD     "Content-Description"
 #define        DISPO_FIELD     "Content-Disposition"
 #define        MD5_FIELD       "Content-MD5"

+#define        ATTACH_FIELD    "Attach"

 
 

-#define        isatom(c)   (!isspace (c) && !iscntrl (c) && (c) != '(' \
+#define        isatom(c)   (isascii((unsigned char) c) \
+                     && !isspace ((unsigned char) c) \
+                    && !iscntrl ((unsigned char) c) && (c) != '(' \

                     && (c) != ')' && (c) != '<'  && (c) != '>' \
                     && (c) != '@' && (c) != ','  && (c) != ';' \
                     && (c) != ':' && (c) != '\\' && (c) != '"' \
                     && (c) != ')' && (c) != '<'  && (c) != '>' \
                     && (c) != '@' && (c) != ','  && (c) != ';' \
                     && (c) != ':' && (c) != '\\' && (c) != '"' \


@@ -25,13 +26,17 @@
  * Test for valid characters used in "token"
  * as defined in RFC2045
  */
  * Test for valid characters used in "token"
  * as defined in RFC2045
  */

-#define        istoken(c)  (!isspace (c) && !iscntrl (c) && (c) != '(' \
+#define        istoken(c)  (isascii((unsigned char) c) \
+                     && !isspace ((unsigned char) c) \
+                    && !iscntrl ((unsigned char) c) && (c) != '(' \

                     && (c) != ')' && (c) != '<'  && (c) != '>' \
                     && (c) != '@' && (c) != ','  && (c) != ';' \
                     && (c) != ':' && (c) != '\\' && (c) != '"' \
                     && (c) != '/' && (c) != '['  && (c) != ']' \
                     && (c) != '?' && (c) != '=')
 
                     && (c) != ')' && (c) != '<'  && (c) != '>' \
                     && (c) != '@' && (c) != ','  && (c) != ';' \
                     && (c) != ':' && (c) != '\\' && (c) != '"' \
                     && (c) != '/' && (c) != '['  && (c) != ']' \
                     && (c) != '?' && (c) != '=')
 

+#define        MAXTEXTPERLN 78
+#define        MAXLONGLINE 998

 #define        CPERLIN 76
 #define        BPERLIN (CPERLIN / 4)
 #define        LPERMSG 632
 #define        CPERLIN 76
 #define        BPERLIN (CPERLIN / 4)
 #define        LPERMSG 632