Change things so we only supply a form filename; most programs don't do

both, and this isn't work the extra hassle.

diff --git a/h/mhparse.h b/h/mhparse.h
index 3685dd9e7067300e689a7f87fefb351fde704594..d165a63bf33250665716083033efc0e0a38288b7 100644 (file)
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -495,11 +495,10 @@ 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 containg 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,
  */
 void show_all_messages(CT *cts, int concat, int textonly, int inlineonly,

-                      char *markerform, char *markerformat);
+                      char *markerform);

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

diff --git a/uip/mhn.c b/uip/mhn.c
index 28f499bb9a0d15dfb5e8c58311f2fd93c30bdb8a..a2733ad20691a18d7526d4275b29edf1e2248e82 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -552,7 +552,7 @@ do_cache:
      * Show the message content
      */
     if (showsw)
      * Show the message content
      */
     if (showsw)

-       show_all_messages (cts, 0, 0, 0, NULL, NULL);
+       show_all_messages (cts, 0, 0, 0, NULL);

 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 97048b08959a58247519539a8e3dd95c32ef1b89..9fb18e7bbf395ba7726fdae35fbc5b0d01909ade 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -388,7 +388,7 @@ do_cache:
     /*
      * Show the message content
      */
     /*
      * Show the message content
      */

-    show_all_messages (cts, concatsw, textonly, inlineonly, NULL, NULL);
+    show_all_messages (cts, concatsw, textonly, inlineonly, NULL);

 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 72ef158403b6760e8a54c97e6438818229cc974d..84c79f46492589a26978d7ea34b635088e444180 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -62,7 +62,7 @@ static int show_external (CT, int, int, int, int, struct format *);
 static int parse_display_string (CT, char *, int *, int *, char *, char *,
                                 size_t, int multipart);
 static int convert_content_charset (CT, char **);
 static int parse_display_string (CT, char *, int *, int *, char *, char *,
                                 size_t, int multipart);
 static int convert_content_charset (CT, char **);

-static struct format *compile_marker(char *, char *);
+static struct format *compile_marker(char *);

 static void output_marker (CT, struct format *);
 static void free_markercomps (void);
 static int pidcheck(int);
 static void output_marker (CT, struct format *);
 static void free_markercomps (void);
 static int pidcheck(int);


@@ -93,7 +93,7 @@ static struct param_comp_list *dispo_pc_list = NULL;
 
 void
 show_all_messages (CT *cts, int concat, int textonly, int inlineonly,
 
 void
 show_all_messages (CT *cts, int concat, int textonly, int inlineonly,

-                  char *markerform, char *markerformat)
+                  char *markerform)

 {
     CT ct, *ctp;
     struct format *fmt;
 {
     CT ct, *ctp;
     struct format *fmt;


@@ -108,7 +108,7 @@ show_all_messages (CT *cts, int concat, int textonly, int inlineonly,
     /*
      * Compile the content marker format line
      */
     /*
      * Compile the content marker format line
      */

-    fmt = compile_marker(markerform, markerformat);
+    fmt = compile_marker(markerform);

 
     /*
      * If form is "mhl.null", suppress display of header.
 
     /*
      * If form is "mhl.null", suppress display of header.


@@ -1207,7 +1207,7 @@ convert_content_charset (CT ct, char **file) {
                       "%|%{ctype-name}%> ]"
 
 static struct format *
                       "%|%{ctype-name}%> ]"
 
 static struct format *

-compile_marker(char *markerform, char *markerformat)
+compile_marker(char *markerform)

 {
     struct format *fmt;
     char *fmtstring;
 {
     struct format *fmt;
     char *fmtstring;


@@ -1215,7 +1215,7 @@ compile_marker(char *markerform, char *markerformat)
     unsigned int bucket;
     struct param_comp_list *pc_entry;
 
     unsigned int bucket;
     struct param_comp_list *pc_entry;
 

-    fmtstring = new_fs(markerform, markerformat, DEFAULT_MARKER);
+    fmtstring = new_fs(markerform, NULL, DEFAULT_MARKER);

 
     (void) fmt_compile(fmtstring, &fmt, 1);
     free(fmtstring);
 
     (void) fmt_compile(fmtstring, &fmt, 1);
     free(fmtstring);