Put in check so "attach" is rejected when the draft already has MIME headers.

[nmh] / h / mhparse.h

diff --git a/h/mhparse.h b/h/mhparse.h
index d6afe0950e24f4067612936b0f0347f5e1d8afc9..7ade8a3c842905cbbfe30fad04e684b636676a96 100644 (file)
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -322,13 +322,14 @@ CT parse_mime (char *);
  *               CE_QUOTED.
  * maxunencoded        - The maximum line length before the default encoding for
  *               text parts is quoted-printable.
+ * verbose     - If 1, output verbose information during message composition
  *
  * 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 encoding, size_t maxunencoded, int verbose);
 
 int add_header (CT, char *, char *);
 int get_ctinfo (char *, CT, int);
@@ -341,28 +342,53 @@ 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 *);
+char *content_charset (CT);
+int convert_charset (CT, char *, int *);
 
 /*
- * Parse a series of MIME attributes (or parameters) given a header as
- * input.
+ * Given a list of messages, display information about them on standard
+ * output.
  *
- * Arguments include:
+ * Argumens are:
  *
- * filename    - Name of input file (for error messages)
- * fieldname   - Name of field being processed
- * headerp     - Pointer to pointer of the beginning of the MIME attributes.
- *               Updated to point to end of attributes when finished.
- * param_head  - Pointer to head of parameter list
- * param_tail  - Pointer to tail of parameter list
- * commentp    - Pointer to header comment pointer (may be NULL)
+ * cts         - An array of CT elements of messages that need to be
+ *               displayed.  Array is terminated by a NULL.
+ * headsw      - If 1, display a column header.
+ * sizesw      - If 1, display the size of the part.
+ * verbosw     - If 1, display verbose information
+ * debugsw     - If 1, turn on debugging for the output.
+ * disposw     - If 1, display MIME part disposition information.
  *
- * Returns OK if parsing was successful, NOTOK if parsing failed, and
- * DONE to indicate a benign error (minor parsing error, but the program
- * should continue).
  */
-int parse_header_attrs (const char *filename, const char *fieldname,
-                       char **headerp, PM *param_head, PM *param_tail,
-                       char **commentp);
+void list_all_messages(CT *cts, int headsw, int sizesw, int verbosw,
+                      int debugsw, int disposw);
+
+/*
+ * List the content information of a single MIME part on stdout.
+ *
+ * Arguments are:
+ *
+ * ct          - MIME Content structure to display.
+ * toplevel    - If set, we're at the top level of a message
+ * realsize    - If set, determine the real size of the content
+ * verbose     - If set, output verbose information
+ * debug       - If set, turn on debugging for the output
+ * dispo       - If set, display MIME part disposition information.
+ *
+ * Returns OK on success, NOTOK otherwise.
+ */
+int list_content(CT ct, int toplevel, int realsize, int verbose, int debug,
+                int dispo);
+
+/*
+ * Display content-appropriate information on MIME parts, decending recursively
+ * into multipart content if appropriate.  Uses list_content() for displaying
+ * generic information.
+ *
+ * Arguments and return value are the same as list_content().
+ */
+int list_switch(CT ct, int toplevel, int realsize, int verbose, int debug,
+               int dispo);
 
 /*
  * Given a linked list of parameters, build an output string for them.  This
@@ -394,10 +420,23 @@ char *output_params(size_t initialwidth, PM params, int *offsetout,
  * last                - Pointer to tail of linked list
  * name                - Name of parameter
  * value       - Value of parameter
+ * nocopy      - If set, will use the pointer values directly for "name"
+ *               and "value" instead of making their own copy.  These
+ *               pointers will be free()'d later by the MIME routines, so
+ *               they should not be used after calling this function!
+ *
+ * Returns allocated parameter element
+ */
+PM add_param(PM *first, PM *last, char *name, char *value, int nocopy);
+
+/*
+ * Replace (or add) a parameter to the parameter linked list.
  *
- * Returned allocated parameter element
+ * If the named parameter already exists on the parameter linked list,
+ * replace the value with the new one.  Otherwise add it to the linked
+ * list.  All parameters are identical to add_param().
  */
-PM add_param(PM *first, PM *last, const char *name, const char *value);
+PM replace_param(PM *first, PM *last, char *name, char *value, int nocopy);
 
 /*
  * Retrieve a parameter value from a parameter linked list.  Convert to the
@@ -418,4 +457,21 @@ PM add_param(PM *first, PM *last, const char *name, const char *value);
 
 char *get_param(PM first, const char *name, char replace, int fetchonly);
 
+/*
+ * Fetch a parameter value from a parameter structure, converting it to
+ * the local character set.
+ *
+ * Arguments are:
+ *
+ * pm          - Pointer to parameter structure
+ * replace     - If characters in the parameter list cannot be converted to
+ *               the local character set, replace with this character.
+ *
+ * Returns a pointer to the parameter value.  Memory is stored in an
+ * internal buffer, so the returned value is only valid until the next
+ * call to get_param_value() or get_param() (get_param() uses get_param_value()
+ * internally).
+ */
+char *get_param_value(PM pm, char replace);
+
 extern int checksw;    /* Add Content-MD5 field */