Remove mhbuild backup files at end of a couple of tests, if successful.

[nmh] / h / mhparse.h

diff --git a/h/mhparse.h b/h/mhparse.h
index 48f221fcb15b913a4c2b5474508d9eabce8db438..72188c6d42d903d2f040bacde1022a7d71807c7a 100644 (file)
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -68,6 +68,16 @@ struct cefile {
 
 /*
  * Primary structure for handling Content (Entity)
+ *
+ * Some more explanation of this:
+ *
+ * This structure recursively describes a complete MIME message.
+ * At the top level, the c_first_hf list has a list of all message
+ * headers.  If the content-type is multipart (c_type == CT_MULTIPART)
+ * then c_ctparams will contain a pointer to a struct multipart.
+ * A struct multipart contains (among other trhings) a linked list
+ * of struct part elements, and THOSE contain a pointer to the sub-part's
+ * Content structure.
  */
 struct Content {
     /* source (read) file */
@@ -97,8 +107,9 @@ struct Content {
     int        c_subtype;              /* internal flag for content subtype */
 
     /* Content-Transfer-Encoding info (decoded contents) */
-    CE c_cefile;               /* structure holding decoded content */
+    struct cefile c_cefile;    /* structure holding decoded content */
     int        c_encoding;             /* internal flag for encoding type   */
+    int c_reqencoding;         /* Requested encoding (by mhbuild)   */
 
     /* Content-MD5 info */
     int        c_digested;             /* have we seen this header before?  */
@@ -162,10 +173,8 @@ struct Content {
 #define TEXT_ENRICHED  0x03
 
 /* Flags for character sets */
-#define        CHARSET_UNKNOWN     0x00
+#define        CHARSET_SPECIFIED    0x00
 #define CHARSET_UNSPECIFIED 0x01  /* only needed when building drafts */
-#define        CHARSET_USASCII     0x01
-#define        CHARSET_LATIN       0x02
 
 /* Structure for text content */
 struct text {
@@ -193,6 +202,8 @@ struct part {
 struct multipart {
     char *mp_start;            /* boundary string separating parts   */
     char *mp_stop;             /* terminating boundary string        */
+    char *mp_content_before;   /* any content before the first subpart */
+    char *mp_content_after;    /* any content after the last subpart */
     struct part *mp_parts;     /* pointer to first subpart structure */
 };
 
@@ -231,6 +242,7 @@ struct exbody {
     char *eb_server;
     char *eb_subject;
     char *eb_body;
+    char *eb_url;
 };
 
 /*
@@ -274,10 +286,49 @@ extern struct str2init str2methods[];
  */
 int pidcheck (int);
 CT parse_mime (char *);
+
+/*
+ * Translate a composition file into a MIME data structure.  Arguments are:
+ *
+ * infile      - Name of input filename
+ * autobuild    - A flag to indicate if the composition file parser is
+ *               being run in automatic mode or not.  In auto mode,
+ *               if a MIME-Version header is encountered it is assumed
+ *               that the composition file is already in MIME format
+ *               and will not be processed further.  Otherwise, an
+ *               error is generated.
+ * dist                - A flag to indicate if we are being run by "dist".  In
+ *               that case, add no MIME headers to the message.  Existing
+ *               headers will still be encoded by RFC 2047.
+ * directives  - A flag to control whether or not build directives are
+ *               processed by default.
+ * encoding    - The default encoding to use when doing RFC 2047 header
+ *               encoding.  Must be one of CE_UNKNOWN, CE_BASE64, or
+ *               CE_QUOTED.
+ * maxunencoded        - The maximum line length before the default encoding for
+ *               text parts is quoted-printable.
+ *
+ * Returns a CT structure describing the resulting MIME message.  If the
+ * -auto flag is set and a MIME-Version header is encountered, the return
+ * value is NULL.
+ */
+CT build_mime (char *infile, int autobuild, int dist, int directives,
+              int encoding, size_t maxunencoded);
+
 int add_header (CT, char *, char *);
-int get_ctinfo (unsigned char *, CT, int);
+int get_ctinfo (char *, CT, int);
 int params_external (CT, int);
 int open7Bit (CT, char **);
 void close_encoding (CT);
+void free_content (CT);
+char *ct_type_str (int);
+char *ct_subtype_str (int, int);
+const struct str2init *get_ct_init (int);
+const char *ce_str (int);
+const struct str2init *get_ce_method (const char *);
+int parse_header_attrs (const char *, int, char **, CI, int *);
+char *update_attr (char *, const char *, const char *e);
+char *content_charset (CT);
+int convert_charset (CT, char *, int *);
 
 extern int checksw;    /* Add Content-MD5 field */