content_error(): Add missing va_end(3).

[nmh] / h / mime.h

diff --git a/h/mime.h b/h/mime.h
index b741b2f250a011ca729cea1ba7cae8af445151cc..e389b28463ed41c4820b3b0541aea517c8e0fc7b 100644 (file)
--- a/h/mime.h
+++ b/h/mime.h
@@ -1,8 +1,4 @@
-
-/*
- * mime.h -- definitions for MIME
- *
- * $Id$
+/* mime.h -- definitions for MIME

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


@@ -12,27 +8,44 @@
 #define        ENCODING_FIELD  "Content-Transfer-Encoding"
 #define        ID_FIELD        "Content-ID"
 #define        DESCR_FIELD     "Content-Description"
 #define        ENCODING_FIELD  "Content-Transfer-Encoding"
 #define        ID_FIELD        "Content-ID"
 #define        DESCR_FIELD     "Content-Description"

+#define        DISPO_FIELD     "Content-Disposition"

 #define        MD5_FIELD       "Content-MD5"
 #define        MD5_FIELD       "Content-MD5"

-
-#define        isatom(c)   (!isspace (c) && !iscntrl (c) && (c) != '(' \
-                    && (c) != ')' && (c) != '<'  && (c) != '>' \
-                    && (c) != '@' && (c) != ','  && (c) != ';' \
-                    && (c) != ':' && (c) != '\\' && (c) != '"' \
-                    && (c) != '.' && (c) != '['  && (c) != ']')
+#define        PSEUDOHEADER_PREFIX        "Nmh-"
+#define        ATTACH_FIELD               PSEUDOHEADER_PREFIX "Attach"
+#define        ATTACH_FIELD_ALT           "Attach"
+#define        MHBUILD_FILE_PSEUDOHEADER  PSEUDOHEADER_PREFIX "mhbuild-file-"
+#define        MHBUILD_ARGS_PSEUDOHEADER  PSEUDOHEADER_PREFIX "mhbuild-args-"

 
 /*
  * 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) != '=')
 

+/*
+ * Definitions for RFC 2231 encoding
+ */
+#define istspecial(c)  ((c) == '(' || (c) == ')' || (c) == '<' || (c) == '>' \
+                       || (c) == '@' || (c) == ',' || (c) == ';' \
+                       || (c) == ':' || (c) == '\\' || (c) == '"' \
+                       || (c) == '/' || (c) == '[' || (c) == ']' \
+                       || (c) == '?' || (c) == '=')
+
+#define isparamencode(c)  (!isascii((unsigned char) c) || \
+                          iscntrl((unsigned char) c) || istspecial(c) || \
+                          (c) == ' ' || (c) == '*' || (c) == '\'' || \
+                          (c) == '%')
+
+#define        MAXTEXTPERLN 78
+#define        MAXLONGLINE 998

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

-