uip/mhshowsbr.h: Move in declarations from h/mhparse.h.

Delete non-existent markerform parameter from show_all_messages()'s
comment.  Alter show_all_messages()'s definition's concatsw parameter to
match comment and prototype.

diff --git a/h/mhparse.h b/h/mhparse.h
index 67c3e8a91edc58a702b4a73de8dd1c63d99309b7..256586f370844ec886d43884b1f1be60dbce8855 100644 (file)
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -365,7 +365,6 @@ 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);
 
 /*
@@ -522,49 +521,6 @@ char *get_param(PM first, const char *name, char replace, int fetchonly);
  */
 char *get_param_value(PM pm, char replace);
 
-/*
- * Display MIME message(s) on standard out.
- *
- * Arguments are:
- *
- * cts         - NULL terminated array of CT structures for messages
- *               to display
- * concat      - If true, concatenate all MIME parts.  If false, show each
- *               MIME part under a separate pager.
- * textonly    - If true, only display "text" MIME parts
- * inlineonly  - If true, only display MIME parts that are marked with
- *               a disposition of "inline" (includes parts that lack a
- *               Content-Disposition header).
- * 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);
-
-/*
- * 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 */
 
 /*

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 4de934f5d944b050119bddd7634ca7eaf271efeb..139b2e861e6ded5477eef24eac6fe9d01b05e934 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -18,11 +18,13 @@
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
+#include <h/fmt_scan.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include "../sbr/m_mktemp.h"
 #include "mhfree.h"
+#include "mhshowsbr.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 549cffe984f54b8af0f254f552419bfffd7ffe69..cef8593f717793ba8ccb83c6121b6acd2a124196 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include <h/fmt_scan.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
@@ -13,6 +14,7 @@
 #include "../sbr/m_mktemp.h"
 #include "mhfree.h"
 #include "mhoutsbr.h"
+#include "mhshowsbr.h"
 #include <fcntl.h>
 
 #define MHFIXMSG_SWITCHES \

diff --git a/uip/mhn.c b/uip/mhn.c
index 6a525917e5f60d97da83bad6765a49a0b397830d..2eff96d740bfe8735ac46d7d7d8a08a8b16b54dd 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -11,6 +11,7 @@
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
+#include <h/fmt_scan.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 073194890d456d9eb22cb16bc0d623ae4401692f..16079dcda4ebb591076b588919a001ede75d4481 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -11,6 +11,7 @@
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
+#include <h/fmt_scan.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index fe64e734e8084793d0b4721c458b82ac38bdcead..20de87cc6dce222c927801db7e93ef394e2b7bfd 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -98,7 +98,7 @@ static struct param_comp_list *dispo_pc_list = NULL;
  */
 
 void
-show_all_messages (CT *cts, int concatsw, int textonly, int inlineonly)
+show_all_messages(CT *cts, int concat, int textonly, int inlineonly)
 {
     CT ct, *ctp;
     struct format *hfmt, *mfmt;
@@ -129,7 +129,7 @@ show_all_messages (CT *cts, int concatsw, int textonly, int inlineonly)
        if (type_ok (ct, 1)) {
            if (headersw) output_header(ct, hfmt);
 
-           show_single_message (ct, formsw, concatsw, textonly, inlineonly,
+           show_single_message (ct, formsw, concat, textonly, inlineonly,
                                 mfmt);
        }
     }

diff --git a/uip/mhshowsbr.h b/uip/mhshowsbr.h
index 83c62bfcdefc410f1583889b030e92e81cecd00e..4b934e08b16b0b34b5ca8bf3230b25961adecf3f 100644 (file)
--- a/uip/mhshowsbr.h
+++ b/uip/mhshowsbr.h
@@ -5,6 +5,49 @@
  * complete copyright information.
  */
 
+
+/*
+ * Display MIME message(s) on standard out.
+ *
+ * Arguments are:
+ *
+ * cts         - NULL terminated array of CT structures for messages
+ *               to display
+ * concat      - If true, concatenate all MIME parts.  If false, show each
+ *               MIME part under a separate pager.
+ * textonly    - If true, only display "text" MIME parts
+ * inlineonly  - If true, only display MIME parts that are marked with
+ *               a disposition of "inline" (includes parts that lack a
+ *               Content-Disposition header).
+ */
+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.
+ */
+int show_content_aux(CT ct, int alternate, char *cp, char *cracked,
+    struct format *fmt);
+
+int convert_charset(CT ct, char *dest_charset, int *message_mods);
+
 extern char *progsw;
 extern int nomore;
 extern char *formsw;

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 7d74f1ea36d11b2f7463278c507e93df755d34e5..d707fb8eb124af98e01e498cdba553ac12925728 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -10,9 +10,11 @@
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
+#include <h/fmt_scan.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include "mhshowsbr.h"
 #include "../sbr/m_mktemp.h"
 
 enum clobber_policy_t {