Added check of -noverbose to test-mhstore.

[nmh] / h / mhparse.h

diff --git a/h/mhparse.h b/h/mhparse.h
index 1dfd7ed8df65abd47bc325a05ab5755b4fd50481..72188c6d42d903d2f040bacde1022a7d71807c7a 100644 (file)
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -109,6 +109,7 @@ struct Content {
     /* Content-Transfer-Encoding info (decoded contents) */
     struct cefile c_cefile;    /* structure holding decoded content */
     int        c_encoding;             /* internal flag for encoding type   */
     /* Content-Transfer-Encoding info (decoded contents) */
     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?  */
 
     /* Content-MD5 info */
     int        c_digested;             /* have we seen this header before?  */


@@ -290,15 +291,29 @@ CT parse_mime (char *);
  * Translate a composition file into a MIME data structure.  Arguments are:
  *
  * infile      - Name of input filename
  * 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
  * 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;
+ *               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.
+ * 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 directives, int encoding);
+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 (char *, CT, int);
 
 int add_header (CT, char *, char *);
 int get_ctinfo (char *, CT, int);


@@ -312,5 +327,8 @@ 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 *);
 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 */
 
 extern int checksw;    /* Add Content-MD5 field */