Remove MIME content caching code

[nmh] / uip / mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index a87778efcf7e4677a85b67317e140261d2205982..9cd673312a9db2b0ff34f9d231a3c2e586984d32 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -1,31 +1,37 @@
-
-/*
- * 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
  * complete copyright information.
  */
 
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 

-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/fmt_new.h"
+#include "sbr/concat.h"
+#include "sbr/trimcpy.h"
+#include "sbr/check_charset.h"
+#include "sbr/getcpy.h"
+#include "sbr/context_find.h"
+#include "sbr/pidstatus.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"

 #include <fcntl.h>
 #include <fcntl.h>

-#include <h/signals.h>
-#include <h/md5.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/signals.h"
+#include "h/mts.h"
+#include "h/tws.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
+#include "h/fmt_scan.h"
+#include "h/done.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 */
 
 extern int debugsw;
 #ifdef HAVE_ICONV
 #   include <iconv.h>
 #endif /* ! HAVE_ICONV */
 
 extern int debugsw;

-extern int npart;
-extern int ntype;
-
-int nolist   = 0;

 
 char *progsw = NULL;
 
 
 char *progsw = NULL;
 


@@ -33,20 +39,13 @@ char *progsw = NULL;
 int nomore   = 0;
 char *formsw = NULL;
 
 int nomore   = 0;
 char *formsw = NULL;
 

-/* for output markerss and headers */
+/* for output markers and headers */

 char *folder = NULL;
 char *markerform;
 char *headerform;
 int headersw = -1;
 
 
 char *folder = NULL;
 char *markerform;
 char *headerform;
 int headersw = -1;
 
 

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

 /*
  * static prototypes
  */
 /*
  * static prototypes
  */


@@ -98,23 +97,16 @@ static struct param_comp_list *dispo_pc_list = NULL;
  */
 
 void
  */
 
 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;
 {
     CT ct, *ctp;

-    struct format *hfmt, *mfmt;

 
     /*
      * If form is not specified, then get default form
      * for showing headers of MIME messages.
      */
     if (!formsw)
 
     /*
      * If form is not specified, then get default form
      * for showing headers of MIME messages.
      */
     if (!formsw)

-       formsw = getcpy (etcpath ("mhl.headers"));
-
-    /*
-     * Compile the content marker and header format lines
-     */
-    mfmt = compile_marker(markerform);
-    hfmt = compile_header(headerform);
+       formsw = mh_xstrdup(etcpath("mhl.headers"));

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


@@ -126,16 +118,31 @@ show_all_messages (CT *cts, int concatsw, 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))
-           if (headersw) output_header(ct, hfmt);
+       if (type_ok (ct, 1)) {
+           /*
+            * Compile the content marker format line
+            */
+           struct format *mfmt = compile_marker(markerform);

 
 

-           show_single_message (ct, formsw, concatsw, textonly, inlineonly,
+           if (headersw) {
+               /*
+                * Compile the header format line
+                */
+               struct format *hfmt = compile_header(headerform);
+               output_header(ct, hfmt);
+               fmt_free(hfmt, 0);
+           }
+
+           show_single_message (ct, formsw, concat, textonly, inlineonly,

                                 mfmt);
                                 mfmt);

+           fmt_free(mfmt, 0);
+       }

     }
 
     }
 

+    /* Reset the format component hashtable, which free's any components which
+       it references. */
+    fmt_free(NULL, 1);

     free_markercomps();
     free_markercomps();

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

 }
 
 
 }
 
 


@@ -200,14 +207,14 @@ static void
 DisplayMsgHeader (CT ct, char *form, int concatsw)
 {
     pid_t child_id;
 DisplayMsgHeader (CT ct, char *form, int concatsw)
 {
     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);
 
     /*
     vec[vecp++] = getcpy(ct->c_file);
 
     /*


@@ -215,18 +222,16 @@ DisplayMsgHeader (CT ct, char *form, int concatsw)
      * then just pass that along.
      */
     if (nomore || concatsw) {
      * then just pass that along.
      */
     if (nomore || concatsw) {

-       vec[vecp++] = getcpy("-nomoreproc");
+       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");


@@ -236,7 +241,7 @@ DisplayMsgHeader (CT ct, char *form, int concatsw)
        execvp (file, vec);
        fprintf (stderr, "unable to exec ");
        perror (mhlproc);
        execvp (file, vec);
        fprintf (stderr, "unable to exec ");
        perror (mhlproc);

-       _exit (-1);
+       _exit(1);

        /* NOTREACHED */
 
     default:
        /* NOTREACHED */
 
     default:


@@ -343,7 +348,7 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format *
 {
     int fd;
     int xstdin = 0, xlist = 0;
 {
     int fd;
     int xstdin = 0, xlist = 0;

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

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


@@ -369,9 +374,9 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format *
                 return NOTOK;
         } else {
             char *charset = content_charset (ct);
                 return NOTOK;
         } else {
             char *charset = content_charset (ct);

-            admonish (NULL, "unable to convert character set%s%s to %s",
+            inform("unable to convert character set%s%s from %s, continuing...",

                       ct->c_partno  ?  " of part "  :  "",
                       ct->c_partno  ?  " of part "  :  "",

-                      ct->c_partno  ?  ct->c_partno  :  "",
+                      FENDNULL(ct->c_partno),

                       charset);
             free (charset);
         }
                       charset);
             free (charset);
         }


@@ -384,7 +389,7 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format *
 
     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;
     }
 
        return NOTOK;
     }
 


@@ -403,7 +408,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
                    int fd, int xlist, int xstdin, struct format *fmt)
 {
     pid_t child_id;
                    int fd, int xlist, int xstdin, struct format *fmt)
 {
     pid_t child_id;

-    int i, vecp;
+    int vecp;

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


@@ -434,13 +439,13 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
        char lastchar = '\n';
 
        if (fd == NOTOK) {
        char lastchar = '\n';
 
        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) {

-           if ((ssize_t) fwrite(readbuf, sizeof(char), cc, stdout) < cc) {
+           if ((ssize_t) fwrite(readbuf, 1, cc, stdout) < cc) {

                advise ("putline", "fwrite");
            }
            lastchar = readbuf[cc - 1];
                advise ("putline", "fwrite");
            }
            lastchar = readbuf[cc - 1];


@@ -460,7 +465,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
 
        if (strcmp(invo_name, "mhshow") == 0 && ct->c_type == CT_TEXT &&
            ct->c_subtype == TEXT_PLAIN && lastchar != '\n') {
 
        if (strcmp(invo_name, "mhshow") == 0 && ct->c_type == CT_TEXT &&
            ct->c_subtype == TEXT_PLAIN && lastchar != '\n') {

-           putc('\n', stdout);
+           putchar('\n');

        }
 
        fflush(stdout);
        }
 
        fflush(stdout);


@@ -469,12 +474,10 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
     }
 
     vec = argsplit(buffer, &file, &vecp);
     }
 
     vec = argsplit(buffer, &file, &vecp);

-    vec[vecp++] = NULL;

 
     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");


@@ -493,19 +496,23 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
            execvp (file, vec);
            fprintf (stderr, "unable to exec ");
            perror (buffer);
            execvp (file, vec);
            fprintf (stderr, "unable to exec ");
            perror (buffer);

-           _exit (-1);
+           _exit(1);

            /* NOTREACHED */
 
        default: {
            int status;
            /* NOTREACHED */
 
        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;

 
 

-           arglist_free(file, vec);
-
-           pidcheck ((status = 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 ? OK : status);
+           return alternate ? OK : status;

         }
     }
 }
         }
     }
 }


@@ -538,7 +545,7 @@ show_text (CT ct, int alternate, int concatsw, struct format *fmt)
        } else
            snprintf (buffer, sizeof(buffer), "%%l%s %%F", progsw ? progsw :
                      moreproc && *moreproc ? moreproc : DEFAULT_PAGER);
        } else
            snprintf (buffer, sizeof(buffer), "%%l%s %%F", progsw ? progsw :
                      moreproc && *moreproc ? moreproc : DEFAULT_PAGER);

-       cp = (ct->c_showproc = add (buffer, NULL));
+       cp = (ct->c_showproc = mh_xstrdup(buffer));

        return show_content_aux (ct, alternate, cp, NULL, fmt);
     }
 
        return show_content_aux (ct, alternate, cp, NULL, fmt);
     }
 


@@ -587,9 +594,9 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly,
     int        alternating, nowalternate, result;
     struct multipart *m = (struct multipart *) ct->c_ctparams;
     struct part *part;
     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;
+    bool request_matched;
+    bool display_success;
+    bool mult_alt_done;

     int ret;
     CT p;
 
     int ret;
     CT p;
 


@@ -607,9 +614,9 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly,
      */
 
     result = NOTOK;
      */
 
     result = NOTOK;

-    request_matched = 0;
-    display_success = 0;
-    mult_alt_done = 0;
+    request_matched = false;
+    display_success = false;
+    mult_alt_done = false;

 
     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;


@@ -630,7 +637,7 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly,
                                      inlineonly, fmt);
            switch (inneresult) {
                case NOTOK:  /* hard display error */
                                      inlineonly, fmt);
            switch (inneresult) {
                case NOTOK:  /* hard display error */

-                   request_matched = 1;
+                   request_matched = true;

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


@@ -641,8 +648,8 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly,
                    continue;
 
                case OK:  /* display successful */
                    continue;
 
                case OK:  /* display successful */

-                   request_matched = 1;
-                   display_success = 1;
+                   request_matched = true;
+                   display_success = true;

                    result = OK;
 
                    /* if we got success on a sub-part of
                    result = OK;
 
                    /* if we got success on a sub-part of


@@ -650,7 +657,7 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly,
                     * there's a chance an explicit part should be
                     * matched later in the alternatives.  */
                    if (alternating) {
                     * there's a chance an explicit part should be
                     * matched later in the alternatives.  */
                    if (alternating) {

-                       mult_alt_done = 1;
+                       mult_alt_done = true;

                    } else if (alternate) {
                        alternate = nowalternate = 0;
                    }
                    } else if (alternate) {
                        alternate = nowalternate = 0;
                    }


@@ -709,7 +716,7 @@ show_multi_aux (CT ct, int alternate, char *cp, struct format *fmt)
            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"))
                return OK;
 
            if (p->c_showproc && !strcmp (p->c_showproc, "true"))
                return OK;


@@ -719,7 +726,7 @@ show_multi_aux (CT ct, int alternate, char *cp, struct format *fmt)
 
     if (parse_display_string (ct, cp, &xstdin, &xlist, file,
                              buffer, sizeof(buffer) - 1, 1)) {
 
     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;
     }
 


@@ -746,7 +753,7 @@ show_message_rfc822 (CT ct, int alternate, struct format *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 ("%pshow -file %F", NULL));
+       cp = (ct->c_showproc = mh_xstrdup("%pshow -file %F"));

        return show_content_aux (ct, alternate, cp, NULL, fmt);
     }
 
        return show_content_aux (ct, alternate, cp, NULL, fmt);
     }
 


@@ -796,8 +803,10 @@ show_external (CT ct, int alternate, int concatsw, int textonly, int inlineonly,
 static int
 parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
                       char *file, char *buffer, size_t buflen,
 static int
 parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
                       char *file, char *buffer, size_t buflen,

-                      int multipart) {
-    int len, quoted = 0;
+                      int multipart)
+{
+    int len;
+    bool quoted = false;

     char *bp = buffer, *pp;
     CI ci = &ct->c_ctinfo;
 
     char *bp = buffer, *pp;
     CI ci = &ct->c_ctinfo;
 


@@ -843,7 +852,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) {


@@ -897,11 +906,11 @@ 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 */

-               *xlist = !nolist;
+               *xlist = 1;

                break;
 
            case 's':
                break;
 
            case 's':


@@ -942,8 +951,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;


@@ -969,7 +977,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
                    *pp++ = '\'';
                    buflen--;
                    bp++;
                    *pp++ = '\'';
                    buflen--;
                    bp++;

-                   quoted = 1;
+                   quoted = true;

                }
                /* Escape existing quotes */
                while ((pp = strchr (pp, '\'')) && buflen > 3) {
                }
                /* Escape existing quotes */
                while ((pp = strchr (pp, '\'')) && buflen > 3) {


@@ -984,7 +992,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
                        *pp++ = '\'';
                        buflen -= 2;
                        bp += 2;
                        *pp++ = '\'';
                        buflen -= 2;
                        bp += 2;

-                       quoted = 0;
+                       quoted = false;

                    } else {
                        /* Not quoted.  This should not be reached with
                           the current code, but handle the condition
                    } else {
                        /* Not quoted.  This should not be reached with
                           the current code, but handle the condition


@@ -992,8 +1000,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. */


@@ -1023,7 +1031,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
                    if (! found_quote) {
                        *bp++ = '\'';
                        buflen--;
                    if (! found_quote) {
                        *bp++ = '\'';
                        buflen--;

-                       quoted = 0;
+                       quoted = false;

                    }
                }
            }
                    }
                }
            }


@@ -1061,7 +1069,8 @@ raw:
 
 
 int
 
 
 int

-convert_charset (CT ct, char *dest_charset, int *message_mods) {
+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;
 


@@ -1074,7 +1083,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
         FILE **fp = NULL;
         size_t begin;
         size_t end;
         FILE **fp = NULL;
         size_t begin;
         size_t end;

-        int opened_input_file = 0;
+        bool opened_input_file = false;

         char src_buffer[BUFSIZ];
        size_t dest_buffer_size = BUFSIZ;
        char *dest_buffer = mh_xmalloc(dest_buffer_size);
         char src_buffer[BUFSIZ];
        size_t dest_buffer_size = BUFSIZ;
        char *dest_buffer = mh_xmalloc(dest_buffer_size);


@@ -1084,16 +1093,16 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
 
         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;
         }
 
         if ((tempfile = m_mktemp2 (NULL, invo_name, &fd, NULL)) == NULL) {
             free (src_charset);
             return NOTOK;
         }
 
         if ((tempfile = m_mktemp2 (NULL, invo_name, &fd, NULL)) == NULL) {

-            adios (NULL, "unable to create temporary file in %s",
+            die("unable to create temporary file in %s",

                    get_temp_dir());
         }
                    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;


@@ -1112,7 +1121,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
                     advise (*file, "unable to open for reading");
                     status = NOTOK;
                 } else {
                     advise (*file, "unable to open for reading");
                     status = NOTOK;
                 } else {

-                    opened_input_file = 1;
+                    opened_input_file = true;

                 }
             }
         }
                 }
             }
         }


@@ -1157,7 +1166,7 @@ iconv_start:
                        }
                        fseeko (*fp, -inbytes, SEEK_CUR);
                        if (end > 0) bytes_to_read += inbytes;
                        }
                        fseeko (*fp, -inbytes, SEEK_CUR);
                        if (end > 0) bytes_to_read += inbytes;

-                       /* advise(NULL, "convert_charset: EINVAL"); */
+                       /* inform("convert_charset: EINVAL"); */

                        continue;
                    }
                    if (errno == EILSEQ) {
                        continue;
                    }
                    if (errno == EILSEQ) {


@@ -1172,17 +1181,16 @@ iconv_start:
                            ib++; inbytes--; /* skip it */
                        }
                        (*ob++) = '?'; outbytes --;
                            ib++; inbytes--; /* skip it */
                        }
                        (*ob++) = '?'; outbytes --;

-                       /* advise(NULL, "convert_charset: EILSEQ"); */
+                       /* inform("convert_charset: EILSEQ"); */

                        goto iconv_start;
                    }
                        goto iconv_start;
                    }

-                   advise (NULL, "convert_charset: errno = %d", errno);
+                   inform("convert_charset: errno = %d", errno);

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

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

                 }
             }
 
                 }
             }
 


@@ -1217,7 +1225,7 @@ iconv_start:
                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);


@@ -1245,7 +1253,7 @@ iconv_start:
 #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);
         errno = ENOSYS;
         status = NOTOK;
                 dest_charset);
         errno = ENOSYS;
         status = NOTOK;


@@ -1258,27 +1266,30 @@ iconv_start:
 
 
 static int
 
 
 static int

-convert_content_charset (CT ct, char **file) {
+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. */
     int status = OK;
 
 #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;
 

-        char *charset = getcpy (get_charset ());
+        char *dest_charset = getcpy (get_charset ());

 
 

-        if (convert_charset (ct, charset, &unused) == 0) {
+        if (convert_charset (ct, dest_charset, &unused) == 0) {

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

+
+        free (dest_charset);

     }
     }

-    free (charset);
+    free (src_charset);

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


@@ -1308,7 +1319,7 @@ compile_header(char *form)
 
     fmtstring = new_fs(form, NULL, DEFAULT_HEADER);
 
 
     fmtstring = new_fs(form, NULL, DEFAULT_HEADER);
 

-    (void) fmt_compile(fmtstring, &fmt, 1);
+    (void) fmt_compile(fmtstring, &fmt, 0);

     free_fs();
 
     while ((comp = fmt_nextcomp(comp, &bucket)) != NULL) {
     free_fs();
 
     while ((comp = fmt_nextcomp(comp, &bucket)) != NULL) {


@@ -1331,7 +1342,7 @@ compile_marker(char *form)
 
     fmtstring = new_fs(form, NULL, DEFAULT_MARKER);
 
 
     fmtstring = new_fs(form, NULL, DEFAULT_MARKER);
 

-    (void) fmt_compile(fmtstring, &fmt, 1);
+    (void) fmt_compile(fmtstring, &fmt, 0);

     free_fs();
 
     /*
     free_fs();
 
     /*


@@ -1356,15 +1367,15 @@ compile_marker(char *form)
            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;


@@ -1429,15 +1440,15 @@ output_marker(CT ct, struct format *fmt, int hidden)
     }
 
     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) {