lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 72ef158403b6760e8a54c97e6438818229cc974d..ebb295b7c57a38a412e74c894b950271c86fe7b2 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * mhshowsbr.c -- routines to display the contents of MIME messages
+/* mhshowsbr.c -- routines to display the contents of MIME messages

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -11,13 +9,15 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>

-#include <setjmp.h>

 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/fmt_scan.h>
 #include <h/utils.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/fmt_scan.h>
 #include <h/utils.h>

+#include "mhmisc.h"
+#include "mhshowsbr.h"
+#include "sbr/m_mktemp.h"

 #ifdef HAVE_ICONV
 #   include <iconv.h>
 #endif /* ! HAVE_ICONV */
 #ifdef HAVE_ICONV
 #   include <iconv.h>
 #endif /* ! HAVE_ICONV */


@@ -32,17 +32,12 @@ char *progsw = NULL;
 int nomore   = 0;
 char *formsw = NULL;
 
 int nomore   = 0;
 char *formsw = NULL;
 

+/* for output markers and headers */
+char *folder = NULL;
+char *markerform;
+char *headerform;
+int headersw = -1;

 
 

-/* mhmisc.c */
-int part_ok (CT, int);
-int type_ok (CT, int);
-void content_error (char *, CT, char *, ...);
-void flush_errors (void);
-
-/*
- * prototypes
- */
-int show_content_aux (CT, int, char *, char *);

 
 /*
  * static prototypes
 
 /*
  * static prototypes


@@ -50,20 +45,22 @@ int show_content_aux (CT, int, char *, char *);
 static void show_single_message (CT, char *, int, int, int, struct format *);
 static void DisplayMsgHeader (CT, char *, int);
 static int show_switch (CT, int, int, int, int, struct format *);
 static void show_single_message (CT, char *, int, int, int, struct format *);
 static void DisplayMsgHeader (CT, char *, int);
 static int show_switch (CT, int, int, int, int, struct format *);

-static int show_content (CT, int, int, int, struct format *fmt);
-static int show_content_aux2 (CT, int, char *, char *, int, int, int);
-static int show_text (CT, int, int);
+static int show_content (CT, int, int, int, struct format *);
+static int show_content_aux2 (CT, int, char *, char *, int, int, int, struct format *);
+static int show_text (CT, int, int, struct format *);

 static int show_multi (CT, int, int, int, int, struct format *);
 static int show_multi (CT, int, int, int, int, struct format *);

-static int show_multi_internal (CT, int, int, int, int, struct format *fmt);
-static int show_multi_aux (CT, int, char *);
-static int show_message_rfc822 (CT, int);
+static int show_multi_internal (CT, int, int, int, int, struct format *);
+static int show_multi_aux (CT, int, char *, struct format *);
+static int show_message_rfc822 (CT, int, struct format *);

 static int show_partial (CT, int);
 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 show_partial (CT, int);
 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 struct format *compile_marker(char *, char *);
-static void output_marker (CT, struct format *);
+static struct format *compile_header(char *);
+static struct format *compile_marker(char *);
+static void output_header (CT, struct format *);
+static void output_marker (CT, struct format *, int);

 static void free_markercomps (void);
 static int pidcheck(int);
 
 static void free_markercomps (void);
 static int pidcheck(int);
 


@@ -72,6 +69,7 @@ static int pidcheck(int);
  * content marker display.
  */
 
  * content marker display.
  */
 

+static struct comp *folder_comp = NULL;

 static struct comp *part_comp = NULL;
 static struct comp *ctype_comp = NULL;
 static struct comp *description_comp = NULL;
 static struct comp *part_comp = NULL;
 static struct comp *ctype_comp = NULL;
 static struct comp *description_comp = NULL;


@@ -92,11 +90,10 @@ static struct param_comp_list *dispo_pc_list = NULL;
  */
 
 void
  */
 
 void

-show_all_messages (CT *cts, int concat, int textonly, int inlineonly,
-                  char *markerform, char *markerformat)
+show_all_messages(CT *cts, int concat, int textonly, int inlineonly)

 {
     CT ct, *ctp;
 {
     CT ct, *ctp;

-    struct format *fmt;
+    struct format *hfmt, *mfmt;

 
     /*
      * If form is not specified, then get default form
 
     /*
      * If form is not specified, then get default form


@@ -106,9 +103,10 @@ show_all_messages (CT *cts, int concat, int textonly, int inlineonly,
        formsw = getcpy (etcpath ("mhl.headers"));
 
     /*
        formsw = getcpy (etcpath ("mhl.headers"));
 
     /*

-     * Compile the content marker format line
+     * Compile the content marker and header format lines

      */
      */

-    fmt = compile_marker(markerform, markerformat);
+    mfmt = compile_marker(markerform);
+    hfmt = compile_header(headerform);

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


@@ -120,12 +118,17 @@ show_all_messages (CT *cts, int concat, int textonly, int inlineonly,
        ct = *ctp;
 
        /* if top-level type is ok, then display message */
        ct = *ctp;
 
        /* if top-level type is ok, then display message */

-       if (type_ok (ct, 1))
-           show_single_message (ct, formsw, concat, textonly, inlineonly, fmt);
+       if (type_ok (ct, 1)) {
+           if (headersw) output_header(ct, hfmt);
+
+           show_single_message (ct, formsw, concat, textonly, inlineonly,
+                                mfmt);
+       }

     }
 
     free_markercomps();
     }
 
     free_markercomps();

-    fmt_free(fmt, 1);
+    fmt_free(hfmt, 1);
+    fmt_free(mfmt, 1);

 }
 
 
 }
 
 


@@ -134,12 +137,12 @@ show_all_messages (CT *cts, int concat, int textonly, int inlineonly,
  */
 
 static void
  */
 
 static void

-show_single_message (CT ct, char *form, int concat, int textonly,
+show_single_message (CT ct, char *form, int concatsw, int textonly,

                     int inlineonly, struct format *fmt)
 {
     sigset_t set, oset;
 
                     int inlineonly, struct format *fmt)
 {
     sigset_t set, oset;
 

-    int status;
+    int status = OK;

 
     /* Allow user executable bit so that temporary directories created by
      * the viewer (e.g., lynx) are going to be accessible */
 
     /* Allow user executable bit so that temporary directories created by
      * the viewer (e.g., lynx) are going to be accessible */


@@ -150,10 +153,10 @@ show_single_message (CT ct, char *form, int concat, int textonly,
      * the message headers.
      */
     if (form)
      * the message headers.
      */
     if (form)

-       DisplayMsgHeader(ct, form, concat);
+       DisplayMsgHeader(ct, form, concatsw);

 
     /* Show the body of the message */
 
     /* Show the body of the message */

-    show_switch (ct, 0, concat, textonly, inlineonly, fmt);
+    show_switch (ct, 0, concatsw, textonly, inlineonly, fmt);

 
     if (ct->c_fp) {
        fclose (ct->c_fp);
 
     if (ct->c_fp) {
        fclose (ct->c_fp);


@@ -170,7 +173,7 @@ show_single_message (CT ct, char *form, int concat, int textonly,
     sigaddset (&set, SIGTERM);
     sigprocmask (SIG_BLOCK, &set, &oset);
 
     sigaddset (&set, SIGTERM);
     sigprocmask (SIG_BLOCK, &set, &oset);
 

-    while (!concat && wait (&status) != NOTOK) {
+    while (!concatsw && wait (&status) != NOTOK) {

        pidcheck (status);
        continue;
     }
        pidcheck (status);
        continue;
     }


@@ -187,36 +190,34 @@ show_single_message (CT ct, char *form, int concat, int textonly,
  */
 
 static void
  */
 
 static void

-DisplayMsgHeader (CT ct, char *form, int concat)
+DisplayMsgHeader (CT ct, char *form, int concatsw)

 {
     pid_t child_id;
 {
     pid_t child_id;

-    int i, vecp;
+    int vecp;

     char **vec;
     char *file;
 
     vec = argsplit(mhlproc, &file, &vecp);
     char **vec;
     char *file;
 
     vec = argsplit(mhlproc, &file, &vecp);

-    vec[vecp++] = getcpy("-form");
-    vec[vecp++] = getcpy(form);
-    vec[vecp++] = getcpy("-nobody");
+    vec[vecp++] = mh_xstrdup("-form");
+    vec[vecp++] = mh_xstrdup(form);
+    vec[vecp++] = mh_xstrdup("-nobody");

     vec[vecp++] = getcpy(ct->c_file);
 
     /*
      * If we've specified -(no)moreproc,
      * then just pass that along.
      */
     vec[vecp++] = getcpy(ct->c_file);
 
     /*
      * If we've specified -(no)moreproc,
      * then just pass that along.
      */

-    if (nomore || concat) {
-       vec[vecp++] = getcpy("-nomoreproc");
+    if (nomore || concatsw) {
+       vec[vecp++] = mh_xstrdup("-nomoreproc");

     } else if (progsw) {
     } else if (progsw) {

-       vec[vecp++] = getcpy("-moreproc");
-       vec[vecp++] = getcpy(progsw);
+       vec[vecp++] = mh_xstrdup("-moreproc");
+       vec[vecp++] = mh_xstrdup(progsw);

     }
     vec[vecp] = NULL;
 
     fflush (stdout);
 
     }
     vec[vecp] = NULL;
 
     fflush (stdout);
 

-    for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-       sleep (5);
-
+    child_id = fork();

     switch (child_id) {
     case NOTOK:
        adios ("fork", "unable to");
     switch (child_id) {
     case NOTOK:
        adios ("fork", "unable to");


@@ -244,12 +245,12 @@ DisplayMsgHeader (CT ct, char *form, int concat)
  */
 
 static int
  */
 
 static int

-show_switch (CT ct, int alternate, int concat, int textonly, int inlineonly,
+show_switch (CT ct, int alternate, int concatsw, int textonly, int inlineonly,

             struct format *fmt)
 {
     switch (ct->c_type) {
        case CT_MULTIPART:
             struct format *fmt)
 {
     switch (ct->c_type) {
        case CT_MULTIPART:

-           return show_multi (ct, alternate, concat, textonly,
+           return show_multi (ct, alternate, concatsw, textonly,

                               inlineonly, fmt);
 
        case CT_MESSAGE:
                               inlineonly, fmt);
 
        case CT_MESSAGE:


@@ -258,25 +259,30 @@ show_switch (CT ct, int alternate, int concat, int textonly, int inlineonly,
                    return show_partial (ct, alternate);
 
                case MESSAGE_EXTERNAL:
                    return show_partial (ct, alternate);
 
                case MESSAGE_EXTERNAL:

-                   return show_external (ct, alternate, concat, textonly,
+                   return show_external (ct, alternate, concatsw, textonly,

                                          inlineonly, fmt);
 
                case MESSAGE_RFC822:
                                          inlineonly, fmt);
 
                case MESSAGE_RFC822:

+                   return show_message_rfc822 (ct, alternate, fmt);
+
+               /*
+                * Treat unknown message types as equivalent to
+                * application/octet-stream for now
+                */

                default:
                default:

-                   return show_message_rfc822 (ct, alternate);
+                   return show_content (ct, alternate, textonly,
+                                        inlineonly, fmt);

            }
 
        case CT_TEXT:
            }
 
        case CT_TEXT:

-           return show_text (ct, alternate, concat);
+           return show_text (ct, alternate, concatsw, fmt);

 
        case CT_AUDIO:
        case CT_IMAGE:
        case CT_VIDEO:
        case CT_APPLICATION:
 
        case CT_AUDIO:
        case CT_IMAGE:
        case CT_VIDEO:
        case CT_APPLICATION:

-           return show_content (ct, alternate, textonly, inlineonly, fmt);
-

        default:
        default:

-           adios (NULL, "unknown content type %d", ct->c_type);
+           return show_content (ct, alternate, textonly, inlineonly, fmt);

     }
 
     return 0;  /* NOT REACHED */
     }
 
     return 0;  /* NOT REACHED */


@@ -291,7 +297,7 @@ static int
 show_content (CT ct, int alternate, int textonly, int inlineonly,
              struct format *fmt)
 {
 show_content (CT ct, int alternate, int textonly, int inlineonly,
              struct format *fmt)
 {

-    char *cp, buffer[BUFSIZ];
+    char *cp;

     CI ci = &ct->c_ctinfo;
 
     /*
     CI ci = &ct->c_ctinfo;
 
     /*


@@ -299,24 +305,17 @@ show_content (CT ct, int alternate, int textonly, int inlineonly,
      * the content-type.
      */
 
      * the content-type.
      */
 

-    if (textonly || (inlineonly && is_inline(ct))) {
-       output_marker(ct, fmt);
+    if (textonly || (inlineonly && !is_inline(ct))) {
+       output_marker(ct, fmt, 1);

        return OK;
     }
 
        return OK;
     }
 

-    /* Check for invo_name-show-type/subtype */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s/%s",
-               invo_name, ci->ci_type, ci->ci_subtype);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-       return show_content_aux (ct, alternate, cp, NULL);
-
-    /* Check for invo_name-show-type */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-       return show_content_aux (ct, alternate, cp, NULL);
+    /* Check for invo_name-show-type[/subtype] */
+    if ((cp = context_find_by_type ("show", ci->ci_type, ci->ci_subtype)))
+       return show_content_aux (ct, alternate, cp, NULL, fmt);

 
     if ((cp = ct->c_showproc))
 
     if ((cp = ct->c_showproc))

-       return show_content_aux (ct, alternate, cp, NULL);
+       return show_content_aux (ct, alternate, cp, NULL, fmt);

 
     /* complain if we are not a part of a multipart/alternative */
     if (!alternate)
 
     /* complain if we are not a part of a multipart/alternative */
     if (!alternate)


@@ -331,11 +330,11 @@ show_content (CT ct, int alternate, int textonly, int inlineonly,
  */
 
 int
  */
 
 int

-show_content_aux (CT ct, int alternate, char *cp, char *cracked)
+show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format *fmt)

 {
     int fd;
     int xstdin = 0, xlist = 0;
 {
     int fd;
     int xstdin = 0, xlist = 0;

-    char *file, buffer[BUFSIZ];
+    char *file = NULL, buffer[NMH_BUFSIZ];

 
     if (!ct->c_ceopenfnx) {
        if (!alternate)
 
     if (!ct->c_ceopenfnx) {
        if (!alternate)


@@ -344,11 +343,10 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked)
        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    file = NULL;

     if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
        return NOTOK;
     if (ct->c_showproc && !strcmp (ct->c_showproc, "true"))
     if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
        return NOTOK;
     if (ct->c_showproc && !strcmp (ct->c_showproc, "true"))

-       return (alternate ? DONE : OK);
+       return OK;

 
     if (! strcmp(invo_name, "mhshow")  &&
         ct->c_type == CT_TEXT  &&  ct->c_subtype == TEXT_PLAIN) {
 
     if (! strcmp(invo_name, "mhshow")  &&
         ct->c_type == CT_TEXT  &&  ct->c_subtype == TEXT_PLAIN) {


@@ -357,14 +355,16 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked)
            some code rearrangement.  And to make this really ugly,
            only do it in mhshow, not mhfixmsg, mhn, or mhstore. */
         if (convert_content_charset (ct, &file) == OK) {
            some code rearrangement.  And to make this really ugly,
            only do it in mhshow, not mhfixmsg, mhn, or mhstore. */
         if (convert_content_charset (ct, &file) == OK) {

-            close_encoding (ct);
+            (*ct->c_ceclosefnx) (ct);

             if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
                 return NOTOK;
         } else {
             if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
                 return NOTOK;
         } else {

-            admonish (NULL, "unable to convert character set%s to %s",
-                      ct->c_partno  ?  "of part "  :  "",
-                      ct->c_partno  ?  ct->c_partno  :  "",
-                      content_charset (ct));
+            char *charset = content_charset (ct);
+            inform("unable to convert character set%s%s from %s, continuing...",
+                      ct->c_partno  ?  " of part "  :  "",
+                      FENDNULL(ct->c_partno),
+                      charset);
+            free (charset);

         }
     }
 
         }
     }
 


@@ -375,13 +375,13 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked)
 
     if (parse_display_string (ct, cp, &xstdin, &xlist, file, buffer,
                              sizeof(buffer) - 1, 0)) {
 
     if (parse_display_string (ct, cp, &xstdin, &xlist, file, buffer,
                              sizeof(buffer) - 1, 0)) {

-       admonish (NULL, "Buffer overflow constructing show command!\n");
+       inform("Buffer overflow constructing show command, continuing...");

        return NOTOK;
     }
 
 got_command:
     return show_content_aux2 (ct, alternate, cracked, buffer,
        return NOTOK;
     }
 
 got_command:
     return show_content_aux2 (ct, alternate, cracked, buffer,

-                             fd, xlist, xstdin);
+                             fd, xlist, xstdin, fmt);

 }
 
 
 }
 
 


@@ -391,10 +391,10 @@ got_command:
 
 static int
 show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
 
 static int
 show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,

-                   int fd, int xlist, int xstdin)
+                   int fd, int xlist, int xstdin, struct format *fmt)

 {
     pid_t child_id;
 {
     pid_t child_id;

-    int i, vecp;
+    int vecp;

     char **vec, *file;
 
     if (debugsw || cracked) {
     char **vec, *file;
 
     if (debugsw || cracked) {


@@ -410,11 +410,8 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
            fprintf (stderr, " using command %s\n", buffer);
     }
 
            fprintf (stderr, " using command %s\n", buffer);
     }
 

-    if (xlist) {
-       if (ct->c_type == CT_MULTIPART)
-           list_content (ct, -1, 1, 0, 0, 0);
-       else
-           list_switch (ct, -1, 1, 0, 0, 0);
+    if (xlist && fmt) {
+       output_marker(ct, fmt, 0);

     }
 
     /*
     }
 
     /*


@@ -425,15 +422,19 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
     if (buffer[0] == '\0') {
        char readbuf[BUFSIZ];
        ssize_t cc;
     if (buffer[0] == '\0') {
        char readbuf[BUFSIZ];
        ssize_t cc;

+       char lastchar = '\n';

 
        if (fd == NOTOK) {
 
        if (fd == NOTOK) {

-           advise(NULL, "Cannot use NULL command to display content-type "
+           inform("Cannot use NULL command to display content-type "

                   "%s/%s", ct->c_ctinfo.ci_type, ct->c_ctinfo.ci_subtype);
            return NOTOK;
        }
 
        while ((cc = read(fd, readbuf, sizeof(readbuf))) > 0) {
                   "%s/%s", ct->c_ctinfo.ci_type, ct->c_ctinfo.ci_subtype);
            return NOTOK;
        }
 
        while ((cc = read(fd, readbuf, sizeof(readbuf))) > 0) {

-           fwrite(readbuf, sizeof(char), cc, stdout);
+           if ((ssize_t) fwrite(readbuf, sizeof(char), cc, stdout) < cc) {
+               advise ("putline", "fwrite");
+           }
+           lastchar = readbuf[cc - 1];

        }
 
        if (cc < 0) {
        }
 
        if (cc < 0) {


@@ -441,6 +442,20 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
            return NOTOK;
        }
 
            return NOTOK;
        }
 

+       /*
+        * The MIME standards allow content to not have a trailing newline.
+        * But because we are (presumably) sending this to stdout, include
+        * a newline for text content if the final character was not a
+        * newline.  Only do this for mhshow.
+        */
+
+       if (strcmp(invo_name, "mhshow") == 0 && ct->c_type == CT_TEXT &&
+           ct->c_subtype == TEXT_PLAIN && lastchar != '\n') {
+           putchar('\n');
+       }
+
+       fflush(stdout);
+

        return OK;
     }
 
        return OK;
     }
 


@@ -449,8 +464,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
 
     fflush (stdout);
 
 
     fflush (stdout);
 

-    for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-       sleep (5);
+    child_id = fork();

     switch (child_id) {
        case NOTOK:
            advise ("fork", "unable to");
     switch (child_id) {
        case NOTOK:
            advise ("fork", "unable to");


@@ -458,25 +472,35 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
            return NOTOK;
 
        case OK:
            return NOTOK;
 
        case OK:

-           if (cracked)
-               chdir (cracked);
+           if (cracked) {
+               if (chdir (cracked) < 0) {
+                   advise (cracked, "chdir");
+               }
+           }

            if (!xstdin)
                dup2 (fd, 0);
            close (fd);
            execvp (file, vec);
            fprintf (stderr, "unable to exec ");
            if (!xstdin)
                dup2 (fd, 0);
            close (fd);
            execvp (file, vec);
            fprintf (stderr, "unable to exec ");

-           perror ("/bin/sh");
+           perror (buffer);

            _exit (-1);
            /* NOTREACHED */
 
            _exit (-1);
            /* NOTREACHED */
 

-       default:
-           arglist_free(file, vec);
+       default: {
+           int status;
+            char *display_prog = vecp > 2  &&  vec[2][0] != '\0'
+                /* Copy the real display program name.  This relies on the
+                   specific construction of vec[] by argsplit(). */
+                ?  vec[2]
+                :  NULL;

 
 

-           pidcheck (pidXwait (child_id, NULL));
+            pidcheck ((status = pidXwait (child_id, display_prog)));

 
 

+            arglist_free(file, vec);

            if (fd != NOTOK)
                (*ct->c_ceclosefnx) (ct);
            if (fd != NOTOK)
                (*ct->c_ceclosefnx) (ct);

-           return (alternate ? DONE : OK);
+           return (alternate ? OK : status);
+        }

     }
 }
 
     }
 }
 


@@ -486,34 +510,30 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
  */
 
 static int
  */
 
 static int

-show_text (CT ct, int alternate, int concat)
+show_text (CT ct, int alternate, int concatsw, struct format *fmt)

 {
     char *cp, buffer[BUFSIZ];
     CI ci = &ct->c_ctinfo;
 
 {
     char *cp, buffer[BUFSIZ];
     CI ci = &ct->c_ctinfo;
 

-    /* Check for invo_name-show-type/subtype */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s/%s",
-               invo_name, ci->ci_type, ci->ci_subtype);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-       return show_content_aux (ct, alternate, cp, NULL);
-
-    /* Check for invo_name-show-type */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-       return show_content_aux (ct, alternate, cp, NULL);
+    /* Check for invo_name-show-type[/subtype] */
+    if ((cp = context_find_by_type ("show", ci->ci_type, ci->ci_subtype)))
+       return show_content_aux (ct, alternate, cp, NULL, fmt);

 
     /*
      * Use default method if content is text/plain, or if
      * if it is not a text part of a multipart/alternative
      */
     if (!alternate || ct->c_subtype == TEXT_PLAIN) {
 
     /*
      * Use default method if content is text/plain, or if
      * if it is not a text part of a multipart/alternative
      */
     if (!alternate || ct->c_subtype == TEXT_PLAIN) {

-       if (concat)
-           snprintf(buffer, sizeof(buffer), "%%l");
-       else
+       if (concatsw) {
+           if (ct->c_termproc)
+               snprintf(buffer, sizeof(buffer), "%%lcat");
+           else
+               snprintf(buffer, sizeof(buffer), "%%l");
+       } else

            snprintf (buffer, sizeof(buffer), "%%l%s %%F", progsw ? progsw :
                      moreproc && *moreproc ? moreproc : DEFAULT_PAGER);
            snprintf (buffer, sizeof(buffer), "%%l%s %%F", progsw ? progsw :
                      moreproc && *moreproc ? moreproc : DEFAULT_PAGER);

-       cp = (ct->c_showproc = add (buffer, NULL));
-       return show_content_aux (ct, alternate, cp, NULL);
+       cp = (ct->c_showproc = mh_xstrdup(buffer));
+       return show_content_aux (ct, alternate, cp, NULL, fmt);

     }
 
     return NOTOK;
     }
 
     return NOTOK;


@@ -525,32 +545,26 @@ show_text (CT ct, int alternate, int concat)
  */
 
 static int
  */
 
 static int

-show_multi (CT ct, int alternate, int concat, int textonly, int inlineonly,
+show_multi (CT ct, int alternate, int concatsw, int textonly, int inlineonly,

            struct format *fmt)
 {
            struct format *fmt)
 {

-    char *cp, buffer[BUFSIZ];
+    char *cp;

     CI ci = &ct->c_ctinfo;
 
     CI ci = &ct->c_ctinfo;
 

-    /* Check for invo_name-show-type/subtype */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s/%s",
-               invo_name, ci->ci_type, ci->ci_subtype);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-       return show_multi_aux (ct, alternate, cp);
-
-    /* Check for invo_name-show-type */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-       return show_multi_aux (ct, alternate, cp);
+    /* Check for invo_name-show-type[/subtype] */
+    if ((cp = context_find_by_type ("show", ci->ci_type, ci->ci_subtype)))
+       return show_multi_aux (ct, alternate, cp, fmt);

 
 

-    if ((cp = ct->c_showproc))
-       return show_multi_aux (ct, alternate, cp);
+    if ((cp = ct->c_showproc)) {
+       return show_multi_aux (ct, alternate, cp, fmt);
+    }

 
     /*
      * Use default method to display this multipart content.  Even
      * unknown types are displayable, since they're treated as mixed
      * per RFC 2046.
      */
 
     /*
      * Use default method to display this multipart content.  Even
      * unknown types are displayable, since they're treated as mixed
      * per RFC 2046.
      */

-    return show_multi_internal (ct, alternate, concat, textonly,
+    return show_multi_internal (ct, alternate, concatsw, textonly,

                                inlineonly, fmt);
 }
 
                                inlineonly, fmt);
 }
 


@@ -561,12 +575,16 @@ show_multi (CT ct, int alternate, int concat, int textonly, int inlineonly,
  */
 
 static int
  */
 
 static int

-show_multi_internal (CT ct, int alternate, int concat, int textonly,
+show_multi_internal (CT ct, int alternate, int concatsw, int textonly,

                     int inlineonly, struct format *fmt)
 {
     int        alternating, nowalternate, result;
     struct multipart *m = (struct multipart *) ct->c_ctparams;
     struct part *part;
                     int inlineonly, struct format *fmt)
 {
     int        alternating, nowalternate, result;
     struct multipart *m = (struct multipart *) ct->c_ctparams;
     struct part *part;

+    int request_matched;
+    int display_success;
+    int mult_alt_done;
+    int ret;

     CT p;
 
     alternating = 0;
     CT p;
 
     alternating = 0;


@@ -577,39 +595,58 @@ show_multi_internal (CT ct, int alternate, int concat, int textonly,
        alternating  = 1;
     }
 
        alternating  = 1;
     }
 

-/*
- * alternate   -> we are a part inside an multipart/alternative
- * alternating -> we are a multipart/alternative
- */
+    /*
+     * alternate   -> we are a part inside a multipart/alternative
+     * alternating -> we are a multipart/alternative
+     */

 
 

-    result = alternate ? NOTOK : OK;
+    result = NOTOK;
+    request_matched = 0;
+    display_success = 0;
+    mult_alt_done = 0;

 
     for (part = m->mp_parts; part; part = part->mp_next) {
        p = part->mp_part;
 
 
     for (part = m->mp_parts; part; part = part->mp_next) {
        p = part->mp_part;
 

-       if (part_ok (p, 1) && type_ok (p, 1)) {
+       /* while looking for the right displayable alternative, we
+        * use a looser search criterion than we do after finding it.
+        * specifically, while still looking, part_ok() will match
+        * "parent" parts (e.g.  "-part 2" where 2 is a high-level
+        * multipart).  after finding it, we use part_exact() to only
+        * choose a part that was requested explicitly.
+        */
+       if ((part_exact(p) && type_ok(p, 1)) ||
+               (!mult_alt_done && part_ok (p) && type_ok (p, 1))) {
+

            int inneresult;
 
            int inneresult;
 

-           inneresult = show_switch (p, nowalternate, concat, textonly,
+           inneresult = show_switch (p, nowalternate, concatsw, textonly,

                                      inlineonly, fmt);
            switch (inneresult) {
                                      inlineonly, fmt);
            switch (inneresult) {

-               case NOTOK:
+               case NOTOK:  /* hard display error */
+                   request_matched = 1;

                    if (alternate && !alternating) {
                        result = NOTOK;
                        goto out;
                    }
                    continue;
 
                    if (alternate && !alternating) {
                        result = NOTOK;
                        goto out;
                    }
                    continue;
 

-               case OK:
-               case DONE:
+               case DONE:  /* found no match on content type */
+                   continue;
+
+               case OK:  /* display successful */
+                   request_matched = 1;
+                   display_success = 1;
+                   result = OK;
+
+                   /* if we got success on a sub-part of
+                    * multipart/alternative, we're done, unless
+                    * there's a chance an explicit part should be
+                    * matched later in the alternatives.  */

                    if (alternating) {
                    if (alternating) {

-                       result = DONE;
-                       break;
-                   }
-                   if (alternate) {
+                       mult_alt_done = 1;
+                   } else if (alternate) {

                        alternate = nowalternate = 0;
                        alternate = nowalternate = 0;

-                       if (result == NOTOK)
-                           result = inneresult;

                    }
                    continue;
            }
                    }
                    continue;
            }


@@ -617,15 +654,23 @@ show_multi_internal (CT ct, int alternate, int concat, int textonly,
        }
     }
 
        }
     }
 

-    if (alternating && !part) {
+    /* we're supposed to be displaying at least something from a
+     * multipart/alternative.  if we've had parts to consider, and
+     * we've had no success, then we should complain.  we shouldn't
+     * complain if none of the parts matched any -part or -type option.
+     */
+    if (alternating && request_matched && !display_success) {
+       /* if we're ourselves an alternate.  don't complain yet. */

        if (!alternate)
            content_error (NULL, ct, "don't know how to display any of the contents");
        result = NOTOK;
        if (!alternate)
            content_error (NULL, ct, "don't know how to display any of the contents");
        result = NOTOK;

-       goto out;

     }
 
 out:
     }
 
 out:

-    return result;
+    /* if no parts matched what was requested, there can't have been
+     * any display errors.  we report DONE rather than OK. */
+    ret = request_matched ? result : DONE;
+    return ret;

 }
 
 
 }
 
 


@@ -635,12 +680,12 @@ out:
  */
 
 static int
  */
 
 static int

-show_multi_aux (CT ct, int alternate, char *cp)
+show_multi_aux (CT ct, int alternate, char *cp, struct format *fmt)

 {
     /* xstdin is only used in the call to parse_display_string():
        its value is ignored in the function. */
     int xstdin = 0, xlist = 0;
 {
     /* xstdin is only used in the call to parse_display_string():
        its value is ignored in the function. */
     int xstdin = 0, xlist = 0;

-    char *file, buffer[BUFSIZ];
+    char *file = NULL, buffer[BUFSIZ];

     struct multipart *m = (struct multipart *) ct->c_ctparams;
     struct part *part;
     CT p;
     struct multipart *m = (struct multipart *) ct->c_ctparams;
     struct part *part;
     CT p;


@@ -655,25 +700,24 @@ show_multi_aux (CT ct, int alternate, char *cp)
        }
 
        if (p->c_storage == NULL) {
        }
 
        if (p->c_storage == NULL) {

-           file = NULL;

            if ((*p->c_ceopenfnx) (p, &file) == NOTOK)
                return NOTOK;
 
            if ((*p->c_ceopenfnx) (p, &file) == NOTOK)
                return NOTOK;
 

-           p->c_storage = add (file, NULL);
+           p->c_storage = mh_xstrdup(FENDNULL(file));

 
            if (p->c_showproc && !strcmp (p->c_showproc, "true"))
 
            if (p->c_showproc && !strcmp (p->c_showproc, "true"))

-               return (alternate ? DONE : OK);
+               return OK;

            (*p->c_ceclosefnx) (p);
        }
     }
 
     if (parse_display_string (ct, cp, &xstdin, &xlist, file,
                              buffer, sizeof(buffer) - 1, 1)) {
            (*p->c_ceclosefnx) (p);
        }
     }
 
     if (parse_display_string (ct, cp, &xstdin, &xlist, file,
                              buffer, sizeof(buffer) - 1, 1)) {

-       admonish (NULL, "Buffer overflow constructing show command!\n");
+       inform("Buffer overflow constructing show command, continuing...");

        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    return show_content_aux2 (ct, alternate, NULL, buffer, NOTOK, xlist, 0);
+    return show_content_aux2 (ct, alternate, NULL, buffer, NOTOK, xlist, 0, fmt);

 }
 
 
 }
 
 


@@ -682,29 +726,22 @@ show_multi_aux (CT ct, int alternate, char *cp)
  */
 
 static int
  */
 
 static int

-show_message_rfc822 (CT ct, int alternate)
+show_message_rfc822 (CT ct, int alternate, struct format *fmt)

 {
 {

-    char *cp, buffer[BUFSIZ];
+    char *cp;

     CI ci = &ct->c_ctinfo;
 
     CI ci = &ct->c_ctinfo;
 

-    /* Check for invo_name-show-type/subtype */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s/%s",
-               invo_name, ci->ci_type, ci->ci_subtype);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-       return show_content_aux (ct, alternate, cp, NULL);
-
-    /* Check for invo_name-show-type */
-    snprintf (buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
-    if ((cp = context_find (buffer)) && *cp != '\0')
-       return show_content_aux (ct, alternate, cp, NULL);
+    /* Check for invo_name-show-type[/subtype] */
+    if ((cp = context_find_by_type ("show", ci->ci_type, ci->ci_subtype)))
+       return show_content_aux (ct, alternate, cp, NULL, fmt);

 
     if ((cp = ct->c_showproc))
 
     if ((cp = ct->c_showproc))

-       return show_content_aux (ct, alternate, cp, NULL);
+       return show_content_aux (ct, alternate, cp, NULL, fmt);

 
     /* default method for message/rfc822 */
     if (ct->c_subtype == MESSAGE_RFC822) {
 
     /* default method for message/rfc822 */
     if (ct->c_subtype == MESSAGE_RFC822) {

-       cp = (ct->c_showproc = add ("%pecho -file %F", NULL));
-       return show_content_aux (ct, alternate, cp, NULL);
+       cp = (ct->c_showproc = mh_xstrdup("%pshow -file %F"));
+       return show_content_aux (ct, alternate, cp, NULL, fmt);

     }
 
     /* complain if we are not a part of a multipart/alternative */
     }
 
     /* complain if we are not a part of a multipart/alternative */


@@ -737,7 +774,7 @@ show_partial (CT ct, int alternate)
  */
 
 static int
  */
 
 static int

-show_external (CT ct, int alternate, int concat, int textonly, int inlineonly,
+show_external (CT ct, int alternate, int concatsw, int textonly, int inlineonly,

               struct format *fmt)
 {
     struct exbody *e = (struct exbody *) ct->c_ctparams;
               struct format *fmt)
 {
     struct exbody *e = (struct exbody *) ct->c_ctparams;


@@ -746,7 +783,7 @@ show_external (CT ct, int alternate, int concat, int textonly, int inlineonly,
     if (!type_ok (p, 0))
        return OK;
 
     if (!type_ok (p, 0))
        return OK;
 

-    return show_switch (p, alternate, concat, textonly, inlineonly, fmt);
+    return show_switch (p, alternate, concatsw, textonly, inlineonly, fmt);

 }
 
 
 }
 
 


@@ -800,7 +837,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
            case 'F':
                /* %f, and stdin is terminal not content */
                *xstdin = 1;
            case 'F':
                /* %f, and stdin is terminal not content */
                *xstdin = 1;

-               /* and fall... */
+               /* FALLTHRU */

 
            case 'f':
                if (multipart) {
 
            case 'f':
                if (multipart) {


@@ -854,7 +891,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
 
            case 'p':
                /* No longer supported */
 
            case 'p':
                /* No longer supported */

-               /* and fall... */
+               /* FALLTHRU */

 
            case 'l':
                /* display listing prior to displaying content */
 
            case 'l':
                /* display listing prior to displaying content */


@@ -899,8 +936,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
                    /* This will get confused if there are multiple %{}'s,
                       but its real purpose is to avoid doing bad things
                       above if a closing brace wasn't found. */
                    /* This will get confused if there are multiple %{}'s,
                       but its real purpose is to avoid doing bad things
                       above if a closing brace wasn't found. */

-                   admonish(NULL,
-                            "no closing brace for display string escape %s",
+                   inform("no closing brace for display string escape %s, continuing...",

                             cp);
                }
                break;
                             cp);
                }
                break;


@@ -949,8 +985,8 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
                           quote. */
                        memmove (pp, pp-1, len+1);
                        *(pp++-1) = '\\';
                           quote. */
                        memmove (pp, pp-1, len+1);
                        *(pp++-1) = '\\';

-                       buflen -= 1;
-                       bp += 1;
+                       buflen--;
+                       bp++;

                    }
                }
                /* If pp is still set, that means we ran out of space. */
                    }
                }
                /* If pp is still set, that means we ran out of space. */


@@ -1022,16 +1058,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
     char *src_charset = content_charset (ct);
     int status = OK;
 
     char *src_charset = content_charset (ct);
     int status = OK;
 

-    /* norm_charmap() is case sensitive. */
-    char *src_charset_u = upcase (src_charset);
-    char *dest_charset_u = upcase (dest_charset);
-    int different_charsets =
-        strcmp (norm_charmap (src_charset), norm_charmap (dest_charset));
-
-    free (dest_charset_u);
-    free (src_charset_u);
-
-    if (different_charsets) {
+    if (strcasecmp (src_charset, dest_charset)) {

 #ifdef HAVE_ICONV
         iconv_t conv_desc = NULL;
         char *dest;
 #ifdef HAVE_ICONV
         iconv_t conv_desc = NULL;
         char *dest;


@@ -1042,12 +1069,16 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
         size_t end;
         int opened_input_file = 0;
         char src_buffer[BUFSIZ];
         size_t end;
         int opened_input_file = 0;
         char src_buffer[BUFSIZ];

+       size_t dest_buffer_size = BUFSIZ;
+       char *dest_buffer = mh_xmalloc(dest_buffer_size);

         HF hf;
         char *tempfile;
         HF hf;
         char *tempfile;

+       int fromutf8 = !strcasecmp(src_charset, "UTF-8");

 
         if ((conv_desc = iconv_open (dest_charset, src_charset)) ==
             (iconv_t) -1) {
 
         if ((conv_desc = iconv_open (dest_charset, src_charset)) ==
             (iconv_t) -1) {

-            advise (NULL, "Can't convert %s to %s", src_charset, dest_charset);
+            inform("Can't convert %s to %s", src_charset, dest_charset);
+            free (src_charset);

             return NOTOK;
         }
 
             return NOTOK;
         }
 


@@ -1055,7 +1086,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
             adios (NULL, "unable to create temporary file in %s",
                    get_temp_dir());
         }
             adios (NULL, "unable to create temporary file in %s",
                    get_temp_dir());
         }

-        dest = add (tempfile, NULL);
+        dest = mh_xstrdup(tempfile);

 
         if (ct->c_cefile.ce_file) {
             file = &ct->c_cefile.ce_file;
 
         if (ct->c_cefile.ce_file) {
             file = &ct->c_cefile.ce_file;


@@ -1088,20 +1119,62 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
             while ((inbytes = fread (src_buffer, 1,
                                      min (bytes_to_read, sizeof src_buffer),
                                      *fp)) > 0) {
             while ((inbytes = fread (src_buffer, 1,
                                      min (bytes_to_read, sizeof src_buffer),
                                      *fp)) > 0) {

-                char dest_buffer[BUFSIZ];

                 ICONV_CONST char *ib = src_buffer;
                 char *ob = dest_buffer;
                 ICONV_CONST char *ib = src_buffer;
                 char *ob = dest_buffer;

-                size_t outbytes = sizeof dest_buffer;
+                size_t outbytes = dest_buffer_size;

                 size_t outbytes_before = outbytes;
 
                 if (end > 0) bytes_to_read -= inbytes;
 
                 size_t outbytes_before = outbytes;
 
                 if (end > 0) bytes_to_read -= inbytes;
 

+iconv_start:

                 if (iconv (conv_desc, &ib, &inbytes, &ob, &outbytes) ==
                     (size_t) -1) {
                 if (iconv (conv_desc, &ib, &inbytes, &ob, &outbytes) ==
                     (size_t) -1) {

+                   if (errno == E2BIG) {
+                       /*
+                        * Bump up the buffer by at least a factor of 2
+                        * over what we need.
+                        */
+                       size_t bumpup = inbytes * 2, ob_off = ob - dest_buffer;
+                       dest_buffer_size += bumpup;
+                       dest_buffer = mh_xrealloc(dest_buffer,
+                                                 dest_buffer_size);
+                       ob = dest_buffer + ob_off;
+                       outbytes += bumpup;
+                       outbytes_before += bumpup;
+                       goto iconv_start;
+                   }
+                   if (errno == EINVAL) {
+                       /* middle of multi-byte sequence */
+                       if (write (fd, dest_buffer, outbytes_before - outbytes) < 0) {
+                           advise (dest, "write");
+                       }
+                       fseeko (*fp, -inbytes, SEEK_CUR);
+                       if (end > 0) bytes_to_read += inbytes;
+                       /* inform("convert_charset: EINVAL"); */
+                       continue;
+                   }
+                   if (errno == EILSEQ) {
+                       /* invalid multi-byte sequence */
+                       if (fromutf8) {
+                           for (++ib, --inbytes;
+                                inbytes > 0 &&
+                                       (((unsigned char) *ib) & 0xc0) == 0x80;
+                                ++ib, --inbytes)
+                               continue;
+                       } else {
+                           ib++; inbytes--; /* skip it */
+                       }
+                       (*ob++) = '?'; outbytes --;
+                       /* inform("convert_charset: EILSEQ"); */
+                       goto iconv_start;
+                   }
+                   inform("convert_charset: errno = %d", errno);

                     status = NOTOK;
                     break;
                     status = NOTOK;
                     break;

-                } else {
-                    write (fd, dest_buffer, outbytes_before - outbytes);
+                }
+
+                if (write (fd, dest_buffer, outbytes_before - outbytes) < 0) {
+                    advise (dest, "write");

                 }
             }
 
                 }
             }
 


@@ -1136,7 +1209,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
                replace_param(&ct->c_ctinfo.ci_first_pm,
                              &ct->c_ctinfo.ci_last_pm, "charset",
                              dest_charset, 0);
                replace_param(&ct->c_ctinfo.ci_first_pm,
                              &ct->c_ctinfo.ci_last_pm, "charset",
                              dest_charset, 0);

-               outline = output_params(strlen(TYPE_FIELD) + 1 + strlen(ctline),
+               outline = output_params(LEN(TYPE_FIELD) + 1 + strlen(ctline),

                                        ct->c_ctinfo.ci_first_pm, NULL, 0);
                if (outline) {
                    ctline = add(outline, ctline);
                                        ct->c_ctinfo.ci_first_pm, NULL, 0);
                if (outline) {
                    ctline = add(outline, ctline);


@@ -1160,54 +1233,89 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
         } else {
             (void) m_unlink (dest);
         }
         } else {
             (void) m_unlink (dest);
         }

+       free(dest_buffer);

 #else  /* ! HAVE_ICONV */
         NMH_UNUSED (message_mods);
 
 #else  /* ! HAVE_ICONV */
         NMH_UNUSED (message_mods);
 

-        advise (NULL, "Can't convert %s to %s without iconv", src_charset,
+        inform("Can't convert %s to %s without iconv", src_charset,

                 dest_charset);
                 dest_charset);

+        errno = ENOSYS;

         status = NOTOK;
 #endif /* ! HAVE_ICONV */
     }
 
         status = NOTOK;
 #endif /* ! HAVE_ICONV */
     }
 

+    free (src_charset);

     return status;
 }
 
 
 static int
 convert_content_charset (CT ct, char **file) {
     return status;
 }
 
 
 static int
 convert_content_charset (CT ct, char **file) {

+    int status = OK;
+

 #ifdef HAVE_ICONV
     /* Using current locale, see if the content needs to be converted. */
 
     /* content_charset() cannot return NULL. */
 #ifdef HAVE_ICONV
     /* Using current locale, see if the content needs to be converted. */
 
     /* content_charset() cannot return NULL. */

-    char *charset = content_charset (ct);
+    char *src_charset = content_charset (ct);

 
 

-    if (! check_charset (charset, strlen (charset))) {
+    if (! check_charset (src_charset, strlen (src_charset))) {

         int unused = 0;
 
         int unused = 0;
 

-        if (convert_charset (ct, get_charset (), &unused) == 0) {
+        char *dest_charset = getcpy (get_charset ());
+
+        if (convert_charset (ct, dest_charset, &unused) == 0) {

             *file = ct->c_cefile.ce_file;
         } else {
             *file = ct->c_cefile.ce_file;
         } else {

-            return NOTOK;
+            status = NOTOK;

         }
         }

+
+        free (dest_charset);

     }
     }

+    free (src_charset);

 #else  /* ! HAVE_ICONV */
     NMH_UNUSED (ct);
     NMH_UNUSED (file);
 #endif /* ! HAVE_ICONV */
 
 #else  /* ! HAVE_ICONV */
     NMH_UNUSED (ct);
     NMH_UNUSED (file);
 #endif /* ! HAVE_ICONV */
 

-    return OK;
+    return status;

 }
 
 /*
  * Compile our format string and save any parameters we care about.
  */
 
 }
 
 /*
  * Compile our format string and save any parameters we care about.
  */
 

-#define DEFAULT_MARKER "[ part %{part} - %{content-type} - %<{description}" \
-                      "%{description}%?{cdispo-filename}%{cdispo-filename}" \
-                      "%|%{ctype-name}%> ]"
+#define DEFAULT_HEADER "[ Message %{folder}%<{folder}:%>%(msg) ]"
+#define DEFAULT_MARKER "[ part %{part} - %{content-type} - " \
+                      "%<{description}%{description}" \
+                        "%?{cdispo-filename}%{cdispo-filename}" \
+                        "%|%{ctype-name}%>  " \
+                      "%(kilo(size))B %<(unseen)\\(suppressed\\)%> ]"
+
+static struct format *
+compile_header(char *form)
+{
+    struct format *fmt;
+    char *fmtstring;
+    struct comp *comp = NULL;
+    unsigned int bucket;
+
+    fmtstring = new_fs(form, NULL, DEFAULT_HEADER);
+
+    (void) fmt_compile(fmtstring, &fmt, 1);
+    free_fs();
+
+    while ((comp = fmt_nextcomp(comp, &bucket)) != NULL) {
+       if (strcasecmp(comp->c_name, "folder") == 0) {
+           folder_comp = comp;
+       }
+    }
+
+    return fmt;
+}

 
 static struct format *
 
 static struct format *

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

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


@@ -1215,10 +1323,10 @@ 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(form, NULL, DEFAULT_MARKER);

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

-    free(fmtstring);
+    free_fs();

 
     /*
      * Things we care about:
 
     /*
      * Things we care about:


@@ -1242,15 +1350,15 @@ compile_marker(char *markerform, char *markerformat)
            dispo_comp = comp;
        } else if (strncasecmp(comp->c_name, "ctype-", 6) == 0 &&
                   strlen(comp->c_name) > 6) {
            dispo_comp = comp;
        } else if (strncasecmp(comp->c_name, "ctype-", 6) == 0 &&
                   strlen(comp->c_name) > 6) {

-           pc_entry = mh_xmalloc(sizeof(*pc_entry));
-           pc_entry->param = getcpy(comp->c_name + 6);
+           NEW(pc_entry);
+           pc_entry->param = mh_xstrdup(comp->c_name + 6);

            pc_entry->comp = comp;
            pc_entry->next = ctype_pc_list;
            ctype_pc_list = pc_entry;
        } else if (strncasecmp(comp->c_name, "cdispo-", 7) == 0 &&
                   strlen(comp->c_name) > 7) {
            pc_entry->comp = comp;
            pc_entry->next = ctype_pc_list;
            ctype_pc_list = pc_entry;
        } else if (strncasecmp(comp->c_name, "cdispo-", 7) == 0 &&
                   strlen(comp->c_name) > 7) {

-           pc_entry = mh_xmalloc(sizeof(*pc_entry));
-           pc_entry->param = getcpy(comp->c_name + 7);
+           NEW(pc_entry);
+           pc_entry->param = mh_xstrdup(comp->c_name + 7);

            pc_entry->comp = comp;
            pc_entry->next = dispo_pc_list;
            dispo_pc_list = pc_entry;
            pc_entry->comp = comp;
            pc_entry->next = dispo_pc_list;
            dispo_pc_list = pc_entry;


@@ -1265,11 +1373,45 @@ compile_marker(char *markerform, char *markerformat)
  */
 
 static void
  */
 
 static void

-output_marker(CT ct, struct format *fmt)
+output_header(CT ct, struct format *fmt)

 {
 {

-    char outbuf[BUFSIZ];
+    charstring_t outbuf = charstring_create (BUFSIZ);
+    int dat[5] = { 0 };
+    char *endp;
+    int message = 0;
+
+    if (folder_comp)
+       folder_comp->c_text = getcpy(folder);
+
+    if (ct->c_file && *ct->c_file) {
+       message = strtol(ct->c_file, &endp, 10);
+       if (*endp) message = 0;
+       dat[0] = message;
+    }
+
+    /* it would be nice to populate dat[2], for %(size) here,
+     * but it's not available.  it might also be nice to know
+     * if the message originally had any mime parts or not -- but
+     * there's also no record of that.  (except for MIME-version:)
+     */
+
+    fmt_scan(fmt, outbuf, BUFSIZ, dat, NULL);
+
+    fputs(charstring_buffer (outbuf), stdout);
+    charstring_free (outbuf);
+
+    fmt_freecomptext();
+}
+
+static void
+output_marker(CT ct, struct format *fmt, int hidden)
+{
+    charstring_t outbuf = charstring_create (BUFSIZ);

     struct param_comp_list *pcentry;
     struct param_comp_list *pcentry;

-    int dat[5];
+    int partsize;
+    int message = 0;
+    char *endp;
+    int dat[5] = { 0 };

 
     /*
      * Grab any items we care about.
 
     /*
      * Grab any items we care about.


@@ -1281,15 +1423,15 @@ output_marker(CT ct, struct format *fmt)
     }
 
     if (part_comp && ct->c_partno) {
     }
 
     if (part_comp && ct->c_partno) {

-       part_comp->c_text = getcpy(ct->c_partno);
+       part_comp->c_text = mh_xstrdup(ct->c_partno);

     }
 
     if (description_comp && ct->c_descr) {
     }
 
     if (description_comp && ct->c_descr) {

-       description_comp->c_text = getcpy(ct->c_descr);
+       description_comp->c_text = mh_xstrdup(ct->c_descr);

     }
 
     if (dispo_comp && ct->c_dispo_type) {
     }
 
     if (dispo_comp && ct->c_dispo_type) {

-       dispo_comp->c_text = getcpy(ct->c_dispo_type);
+       dispo_comp->c_text = mh_xstrdup(ct->c_dispo_type);

     }
 
     for (pcentry = ctype_pc_list; pcentry != NULL; pcentry = pcentry->next) {
     }
 
     for (pcentry = ctype_pc_list; pcentry != NULL; pcentry = pcentry->next) {


@@ -1302,9 +1444,28 @@ output_marker(CT ct, struct format *fmt)
                                          pcentry->param, '?', 0);
     }
 
                                          pcentry->param, '?', 0);
     }
 

-    fmt_scan(fmt, outbuf, sizeof(outbuf), sizeof(outbuf), dat, NULL);
+    if (ct->c_cesizefnx)
+       partsize = (*ct->c_cesizefnx) (ct);
+    else
+       partsize = ct->c_end - ct->c_begin;
+
+    if (ct->c_file && *ct->c_file) {
+       message = strtol(ct->c_file, &endp, 10);
+       if (*endp) message = 0;
+       dat[0] = message;
+    }
+    dat[2] = partsize;
+
+    /* make the part's hidden aspect available by overloading the
+     * %(unseen) function.  make the part's size available via %(size).
+     * see comments in h/fmt_scan.h.
+     */
+    dat[4] = hidden;
+
+    fmt_scan(fmt, outbuf, BUFSIZ, dat, NULL);

 
 

-    fputs(outbuf, stdout);
+    fputs(charstring_buffer (outbuf), stdout);
+    charstring_free (outbuf);

 
     fmt_freecomptext();
 }
 
     fmt_freecomptext();
 }


@@ -1318,6 +1479,7 @@ free_markercomps(void)
 {
     struct param_comp_list *pc_entry, *pc2;
 
 {
     struct param_comp_list *pc_entry, *pc2;
 

+    folder_comp = NULL;

     part_comp = NULL;
     ctype_comp = NULL;
     description_comp = NULL;
     part_comp = NULL;
     ctype_comp = NULL;
     description_comp = NULL;