From: Ralph Corderoy Date: Mon, 15 May 2017 17:06:19 +0000 (+0100) Subject: uip/mhshowsbr.h: Move in declarations from h/mhparse.h. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/a9bb157da7d3cee576e8944eaf8fab2bdbc4be8d?ds=inline;hp=--cc 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. --- a9bb157da7d3cee576e8944eaf8fab2bdbc4be8d diff --git a/h/mhparse.h b/h/mhparse.h index 67c3e8a9..256586f3 100644 --- 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 4de934f5..139b2e86 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -18,11 +18,13 @@ #include #include #include +#include #include #include #include #include "../sbr/m_mktemp.h" #include "mhfree.h" +#include "mhshowsbr.h" #ifdef HAVE_SYS_TIME_H # include diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c index 549cffe9..cef8593f 100644 --- a/uip/mhfixmsg.c +++ b/uip/mhfixmsg.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include @@ -13,6 +14,7 @@ #include "../sbr/m_mktemp.h" #include "mhfree.h" #include "mhoutsbr.h" +#include "mhshowsbr.h" #include #define MHFIXMSG_SWITCHES \ diff --git a/uip/mhn.c b/uip/mhn.c index 6a525917..2eff96d7 100644 --- a/uip/mhn.c +++ b/uip/mhn.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/uip/mhshow.c b/uip/mhshow.c index 07319489..16079dcd 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index fe64e734..20de87cc 100644 --- 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 83c62bfc..4b934e08 100644 --- 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 7d74f1ea..d707fb8e 100644 --- a/uip/mhstoresbr.c +++ b/uip/mhstoresbr.c @@ -10,9 +10,11 @@ #include #include #include +#include #include #include #include +#include "mhshowsbr.h" #include "../sbr/m_mktemp.h" enum clobber_policy_t {