Added NMH_ADDL_CPPFLAGS macro in new m4/cppflags.m4, to remove

[nmh] / h / mhparse.h

diff --git a/h/mhparse.h b/h/mhparse.h
index 3685dd9e7067300e689a7f87fefb351fde704594..08dd77c11180d8cad08f6248647ffd289502fecb 100644 (file)
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -6,7 +6,7 @@
 
 #define        NPARTS  50
 #define        NTYPES  20
 
 #define        NPARTS  50
 #define        NTYPES  20

-#define        NPARMS  10
+#define        NPREFS  20

 
 /*
  * Abstract type for header fields
 
 /*
  * Abstract type for header fields


@@ -193,6 +193,10 @@ struct Content {
 /* Structure for text content */
 struct text {
     int        tx_charset;             /* flag for character set */
 /* Structure for text content */
 struct text {
     int        tx_charset;             /* flag for character set */

+    int lf_line_endings;        /* Whether to use CR LF (0) or LF (1) line
+                                   endings.  The meaning of 0 was selected so
+                                   that CR LF is the default, in accordance
+                                   with RFC 2046, Sec. 4.1.1, Par. 1. */

 };
 
 /*
 };
 
 /*


@@ -205,6 +209,7 @@ struct text {
 #define        MULTI_ALTERNATE 0x02
 #define        MULTI_DIGEST    0x03
 #define        MULTI_PARALLEL  0x04
 #define        MULTI_ALTERNATE 0x02
 #define        MULTI_DIGEST    0x03
 #define        MULTI_PARALLEL  0x04

+#define        MULTI_RELATED   0x05

 
 /* Structure for subparts of a multipart content */
 struct part {
 
 /* Structure for subparts of a multipart content */
 struct part {


@@ -337,11 +342,14 @@ void close_encoding (CT);
 void free_content (CT);
 char *ct_type_str (int);
 char *ct_subtype_str (int, int);
 void free_content (CT);
 char *ct_type_str (int);
 char *ct_subtype_str (int, int);

+int ct_str_type (const char *);
+int ct_str_subtype (int, const char *);

 const struct str2init *get_ct_init (int);
 const char *ce_str (int);
 const struct str2init *get_ce_method (const char *);
 char *content_charset (CT);
 int convert_charset (CT, char *, int *);
 const struct str2init *get_ct_init (int);
 const char *ce_str (int);
 const struct str2init *get_ce_method (const char *);
 char *content_charset (CT);
 int convert_charset (CT, char *, int *);

+void reverse_alternative_parts (CT);

 
 /*
  * Given a content structure, return true if the content has a disposition
 
 /*
  * Given a content structure, return true if the content has a disposition


@@ -495,11 +503,44 @@ char *get_param_value(PM pm, char replace);
  * inlineonly  - If true, only display MIME parts that are marked with
  *               a disposition of "inline" (includes parts that lack a
  *               Content-Disposition header).
  * inlineonly  - If true, only display MIME parts that are marked with
  *               a disposition of "inline" (includes parts that lack a
  *               Content-Disposition header).

- * markerform  - A file of mh-format(5) code used to display info about
- *               MIME parts.
- * markerformat - mh-format(5) code used to display info about MIME parts.
+ * markerform  - The name of a file containing mh-format(5) code used to
+ *               display markers about non-displayed MIME parts.

  */
  */

-void show_all_messages(CT *cts, int concat, int textonly, int inlineonly,
-                      char *markerform, char *markerformat);
+void show_all_messages(CT *cts, int concat, int textonly, int inlineonly);
+
+/*
+ * Display (or store) a single MIME part using the specified command
+ *
+ * Arguments are:
+ *
+ * ct          - The Content structure of the MIME part we wish to display
+ * alternate   - Set this to true if this is one part of a MIME
+ *               multipart/alternative part.  Will suppress some errors and
+ *               will cause the function to return DONE instead of OK on
+ *               success.
+ * cp          - The command string to execute.  Will be run through the
+ *               parser for %-escapes as described in mhshow(1).
+ * cracked     - If set, chdir() to this directory before executing the
+ *               command in "cp".  Only used by mhstore(1).
+ * fmt         - A series of mh-format(5) instructions to execute if the
+ *               command string indicates a marker is desired.  Can be NULL.
+ *
+ * Returns NOTOK if we could not display the part, DONE if alternate was
+ * set and we could display the part, and OK if alternate was not set and
+ * we could display the part.
+ */
+struct format;
+int show_content_aux(CT ct, int alternate, char *cp, char *cracked,
+                    struct format *fmt);

 
 extern int checksw;    /* Add Content-MD5 field */
 
 extern int checksw;    /* Add Content-MD5 field */

+
+/*
+ * mhstore
+ * Put it here because it uses the CT typedef.
+ */
+typedef struct mhstoreinfo *mhstoreinfo_t;
+mhstoreinfo_t mhstoreinfo_create(CT *, char *, const char *, int, int);
+int mhstoreinfo_files_not_clobbered(const mhstoreinfo_t);
+void mhstoreinfo_free(mhstoreinfo_t);
+void store_all_messages (mhstoreinfo_t);