getpass.c: Move interface to own file.

[nmh] / uip / mhfixmsg.c

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index cab759a40554ce271abe387463bd3a753bd2ceb6..dd0d8a232d000809e5a5e01e8f85502695f03e0c 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -5,12 +5,29 @@
  * distribution for complete copyright information.
  */
 
  * distribution for complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/fmt_scan.h>
-#include <h/mime.h>
-#include <h/mhparse.h>
-#include <h/utils.h>
-#include <h/signals.h>
+#include "h/mh.h"
+#include "sbr/fmt_rfc2047.h"
+#include "sbr/cpydata.h"
+#include "sbr/trimcpy.h"
+#include "sbr/m_convert.h"
+#include "sbr/m_backup.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/readconfig.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/fmt_scan.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "h/signals.h"

 #include "sbr/m_maildir.h"
 #include "sbr/m_mktemp.h"
 #include "sbr/mime_type.h"
 #include "sbr/m_maildir.h"
 #include "sbr/m_mktemp.h"
 #include "sbr/mime_type.h"


@@ -122,7 +139,8 @@ static void pipeser (int);
 
 
 int
 
 
 int

-main (int argc, char **argv) {
+main (int argc, char **argv)
+{

     int msgnum;
     char *cp, *file = NULL, *folder = NULL;
     char *maildir = NULL, buf[100], *outfile = NULL;
     int msgnum;
     char *cp, *file = NULL, *folder = NULL;
     char *maildir = NULL, buf[100], *outfile = NULL;


@@ -131,8 +149,8 @@ main (int argc, char **argv) {
     struct msgs *mp = NULL;
     CT *ctp;
     FILE *fp, *infp = NULL, *outfp = NULL;
     struct msgs *mp = NULL;
     CT *ctp;
     FILE *fp, *infp = NULL, *outfp = NULL;

-    int using_stdin = 0;
-    int chgflag = 1;
+    bool using_stdin = false;
+    bool chgflag = true;

     int status = OK;
     fix_transformations fx;
     fx.reformat = fx.fixcompositecte = fx.fixboundary = 1;
     int status = OK;
     fix_transformations fx;
     fx.reformat = fx.fixcompositecte = fx.fixboundary = 1;


@@ -143,7 +161,7 @@ main (int argc, char **argv) {
     fx.lf_line_endings = 0;
     fx.textcharset = NULL;
 
     fx.lf_line_endings = 0;
     fx.textcharset = NULL;
 

-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -158,7 +176,7 @@ main (int argc, char **argv) {
                 ambigsw (cp, switches);
                 done (1);
             case UNKWNSW:
                 ambigsw (cp, switches);
                 done (1);
             case UNKWNSW:

-                adios (NULL, "-%s unknown", cp);
+                die("-%s unknown", cp);

 
             case HELPSW:
                 snprintf (buf, sizeof buf, "%s [+folder] [msgs] [switches]",
 
             case HELPSW:
                 snprintf (buf, sizeof buf, "%s [+folder] [msgs] [switches]",


@@ -171,7 +189,7 @@ main (int argc, char **argv) {
 
             case DECODETEXTSW:
                 if (! (cp = *argp++)  ||  *cp == '-') {
 
             case DECODETEXTSW:
                 if (! (cp = *argp++)  ||  *cp == '-') {

-                    adios (NULL, "missing argument to %s", argp[-2]);
+                    die("missing argument to %s", argp[-2]);

                 }
                 if (! strcasecmp (cp, "8bit")) {
                     fx.decodetext = CE_8BIT;
                 }
                 if (! strcasecmp (cp, "8bit")) {
                     fx.decodetext = CE_8BIT;


@@ -180,7 +198,7 @@ main (int argc, char **argv) {
                 } else if (! strcasecmp (cp, "binary")) {
                     fx.decodetext = CE_BINARY;
                 } else {
                 } else if (! strcasecmp (cp, "binary")) {
                     fx.decodetext = CE_BINARY;
                 } else {

-                    adios (NULL, "invalid argument to %s", argp[-2]);
+                    die("invalid argument to %s", argp[-2]);

                 }
                 continue;
             case NDECODETEXTSW:
                 }
                 continue;
             case NDECODETEXTSW:


@@ -188,7 +206,7 @@ main (int argc, char **argv) {
                 continue;
             case DECODETYPESW:
                 if (! (cp = *argp++)  ||  *cp == '-') {
                 continue;
             case DECODETYPESW:
                 if (! (cp = *argp++)  ||  *cp == '-') {

-                    adios (NULL, "missing argument to %s", argp[-2]);
+                    die("missing argument to %s", argp[-2]);

                 }
                 fx.decodetypes = cp;
                 continue;
                 }
                 fx.decodetypes = cp;
                 continue;


@@ -200,7 +218,7 @@ main (int argc, char **argv) {
                 continue;
             case TEXTCHARSETSW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1])) {
                 continue;
             case TEXTCHARSETSW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1])) {

-                    adios (NULL, "missing argument to %s", argp[-2]);
+                    die("missing argument to %s", argp[-2]);

                 }
                 fx.textcharset = cp;
                 continue;
                 }
                 fx.textcharset = cp;
                 continue;


@@ -221,13 +239,13 @@ main (int argc, char **argv) {
                 continue;
             case FIXTYPESW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1])) {
                 continue;
             case FIXTYPESW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1])) {

-                    adios (NULL, "missing argument to %s", argp[-2]);
+                    die("missing argument to %s", argp[-2]);

                 }
                 if (! strncasecmp (cp, "multipart/", 10)  ||
                     ! strncasecmp (cp, "message/", 8))
                 }
                 if (! strncasecmp (cp, "multipart/", 10)  ||
                     ! strncasecmp (cp, "message/", 8))

-                    adios (NULL, "-fixtype %s not allowed", cp);
+                    die("-fixtype %s not allowed", cp);

                 if (! strchr (cp, '/'))
                 if (! strchr (cp, '/'))

-                    adios (NULL, "-fixtype requires type/subtype");
+                    die("-fixtype requires type/subtype");

                 if (fx.fixtypes == NULL) { fx.fixtypes = svector_create (10); }
                 svector_push_back (fx.fixtypes, cp);
                 continue;
                 if (fx.fixtypes == NULL) { fx.fixtypes = svector_create (10); }
                 svector_push_back (fx.fixtypes, cp);
                 continue;


@@ -245,29 +263,29 @@ main (int argc, char **argv) {
                 continue;
             case FILESW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1])) {
                 continue;
             case FILESW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1])) {

-                    adios (NULL, "missing argument to %s", argp[-2]);
+                    die("missing argument to %s", argp[-2]);

                 }
                 file = *cp == '-'  ?  mh_xstrdup (cp)  :  path (cp, TFILE);
                 continue;
             case OUTFILESW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1])) {
                 }
                 file = *cp == '-'  ?  mh_xstrdup (cp)  :  path (cp, TFILE);
                 continue;
             case OUTFILESW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1])) {

-                    adios (NULL, "missing argument to %s", argp[-2]);
+                    die("missing argument to %s", argp[-2]);

                 }
                 outfile = *cp == '-'  ?  mh_xstrdup (cp)  :  path (cp, TFILE);
                 continue;
             case RPROCSW:
                 if (!(rmmproc = *argp++) || *rmmproc == '-') {
                 }
                 outfile = *cp == '-'  ?  mh_xstrdup (cp)  :  path (cp, TFILE);
                 continue;
             case RPROCSW:
                 if (!(rmmproc = *argp++) || *rmmproc == '-') {

-                    adios (NULL, "missing argument to %s", argp[-2]);
+                    die("missing argument to %s", argp[-2]);

                 }
                 continue;
             case NRPRCSW:
                 rmmproc = NULL;
                 continue;
             case CHGSW:
                 }
                 continue;
             case NRPRCSW:
                 rmmproc = NULL;
                 continue;
             case CHGSW:

-                chgflag = 1;
+                chgflag = true;

                 continue;
             case NCHGSW:
                 continue;
             case NCHGSW:

-                chgflag = 0;
+                chgflag = false;

                 continue;
             case VERBSW:
                 verbosw = 1;
                 continue;
             case VERBSW:
                 verbosw = 1;


@@ -279,7 +297,7 @@ main (int argc, char **argv) {
         }
         if (*cp == '+' || *cp == '@') {
             if (folder)
         }
         if (*cp == '+' || *cp == '@') {
             if (folder)

-                adios (NULL, "only one folder at a time!");
+                die("only one folder at a time!");

             folder = pluspath (cp);
         } else {
             if (*cp == '/') {
             folder = pluspath (cp);
         } else {
             if (*cp == '/') {


@@ -310,7 +328,7 @@ main (int argc, char **argv) {
     }
 
     if (file && msgs.size) {
     }
 
     if (file && msgs.size) {

-        adios (NULL, "cannot specify msg and file at same time!");
+        die("cannot specify msg and file at same time!");

     }
 
     if (outfile) {
     }
 
     if (outfile) {


@@ -337,10 +355,10 @@ main (int argc, char **argv) {
             int fd;
             char *cp;
 
             int fd;
             char *cp;
 

-            using_stdin = 1;
+            using_stdin = true;

 
             if ((cp = m_mktemp2 (NULL, invo_name, &fd, NULL)) == NULL) {
 
             if ((cp = 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());
             } else {
                 free (file);
                        get_temp_dir());
             } else {
                 free (file);


@@ -350,7 +368,7 @@ main (int argc, char **argv) {
 
             if (close (fd)) {
                 (void) m_unlink (file);
 
             if (close (fd)) {
                 (void) m_unlink (file);

-                adios (NULL, "failed to write temporary file");
+                die("failed to write temporary file");

             }
         }
 
             }
         }
 


@@ -405,12 +423,12 @@ main (int argc, char **argv) {
 
         /* read folder and create message structure */
         if (! (mp = folder_read (folder, 1))) {
 
         /* read folder and create message structure */
         if (! (mp = folder_read (folder, 1))) {

-            adios (NULL, "unable to read folder %s", folder);
+            die("unable to read folder %s", folder);

         }
 
         /* check for empty folder */
         if (mp->nummsg == 0) {
         }
 
         /* check for empty folder */
         if (mp->nummsg == 0) {

-            adios (NULL, "no messages in %s", folder);
+            die("no messages in %s", folder);

         }
 
         /* parse all the message ranges/sequences and set SELECTED */
         }
 
         /* parse all the message ranges/sequences and set SELECTED */


@@ -516,13 +534,14 @@ main (int argc, char **argv) {
  */
 static int
 mhfixmsgsbr (CT *ctp, char *maildir, const fix_transformations *fx,
  */
 static int
 mhfixmsgsbr (CT *ctp, char *maildir, const fix_transformations *fx,

-             FILE **infp, char *outfile, FILE **outfp) {
+             FILE **infp, char *outfile, FILE **outfp)
+{

     /* Store input filename in case one of the transformations, i.e.,
        fix_boundary(), rewrites to a tmp file. */
     char *input_filename = maildir
         ?  concat (maildir, "/", (*ctp)->c_file, NULL)
         :  mh_xstrdup ((*ctp)->c_file);
     /* Store input filename in case one of the transformations, i.e.,
        fix_boundary(), rewrites to a tmp file. */
     char *input_filename = maildir
         ?  concat (maildir, "/", (*ctp)->c_file, NULL)
         :  mh_xstrdup ((*ctp)->c_file);

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

     int message_mods = 0;
     int status = OK;
 
     int message_mods = 0;
     int status = OK;
 


@@ -534,19 +553,19 @@ mhfixmsgsbr (CT *ctp, char *maildir, const fix_transformations *fx,
     }
 
     if (outfile == NULL) {
     }
 
     if (outfile == NULL) {

-        modify_inplace = 1;
+        modify_inplace = true;

 
         if ((*ctp)->c_file) {
             char *tempfile;
             /* outfp will be closed by the caller */
             if ((tempfile = m_mktemp2 (NULL, invo_name, NULL, outfp)) ==
                 NULL) {
 
         if ((*ctp)->c_file) {
             char *tempfile;
             /* outfp will be closed by the caller */
             if ((tempfile = m_mktemp2 (NULL, invo_name, NULL, outfp)) ==
                 NULL) {

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

                        get_temp_dir());
             }
             outfile = mh_xstrdup (tempfile);
         } else {
                        get_temp_dir());
             }
             outfile = mh_xstrdup (tempfile);
         } else {

-            adios (NULL, "missing both input and output filenames\n");
+            die("missing both input and output filenames\n");

         }
     } /* else *outfp was defined by caller */
 
         }
     } /* else *outfp was defined by caller */
 


@@ -623,7 +642,8 @@ mhfixmsgsbr (CT *ctp, char *maildir, const fix_transformations *fx,
  */
 static int
 copy_input_to_output (const char *input_filename, FILE *infp,
  */
 static int
 copy_input_to_output (const char *input_filename, FILE *infp,

-                      const char *output_filename, FILE *outfp) {
+                      const char *output_filename, FILE *outfp)
+{

     int in = fileno (infp);
     int out = fileno (outfp);
     int status = OK;
     int in = fileno (infp);
     int out = fileno (outfp);
     int status = OK;


@@ -642,7 +662,8 @@ copy_input_to_output (const char *input_filename, FILE *infp,
  * Fix mismatched outer level boundary.
  */
 static int
  * Fix mismatched outer level boundary.
  */
 static int

-fix_boundary (CT *ct, int *message_mods) {
+fix_boundary (CT *ct, int *message_mods)
+{

     struct multipart *mp;
     int status = OK;
 
     struct multipart *mp;
     int status = OK;
 


@@ -718,7 +739,8 @@ fix_boundary (CT *ct, int *message_mods) {
  * Find boundary at end of multipart.
  */
 static int
  * Find boundary at end of multipart.
  */
 static int

-get_multipart_boundary (CT ct, char **part_boundary) {
+get_multipart_boundary (CT ct, char **part_boundary)
+{

     char buffer[NMH_BUFSIZ];
     char *end_boundary = NULL;
     off_t begin = (off_t) ct->c_end > (off_t) (ct->c_begin + sizeof buffer)
     char buffer[NMH_BUFSIZ];
     char *end_boundary = NULL;
     off_t begin = (off_t) ct->c_end > (off_t) (ct->c_begin + sizeof buffer)


@@ -805,7 +827,8 @@ get_multipart_boundary (CT ct, char **part_boundary) {
  * Open and copy ct->c_file to file, replacing the multipart boundary.
  */
 static int
  * Open and copy ct->c_file to file, replacing the multipart boundary.
  */
 static int

-replace_boundary (CT ct, char *file, char *boundary) {
+replace_boundary (CT ct, char *file, char *boundary)
+{

     FILE *fpin, *fpout;
     int compnum, state;
     char buf[NMH_BUFSIZ], name[NAMESZ];
     FILE *fpin, *fpout;
     int compnum, state;
     char buf[NMH_BUFSIZ], name[NAMESZ];


@@ -912,7 +935,8 @@ replace_boundary (CT ct, char *file, char *boundary) {
  * Fix Content-Type header to reflect the content of its part.
  */
 static int
  * Fix Content-Type header to reflect the content of its part.
  */
 static int

-fix_types (CT ct, svector_t fixtypes, int *message_mods) {
+fix_types (CT ct, svector_t fixtypes, int *message_mods)
+{

     int status = OK;
 
     switch (ct->c_type) {
     int status = OK;
 
     switch (ct->c_type) {


@@ -1026,7 +1050,8 @@ fix_types (CT ct, svector_t fixtypes, int *message_mods) {
  * Replace a substring, allocating space to hold the new one.
  */
 char *
  * Replace a substring, allocating space to hold the new one.
  */
 char *

-replace_substring (char **str, const char *old, const char *new) {
+replace_substring (char **str, const char *old, const char *new)
+{

     char *cp;
 
     if ((cp = strstr (*str, old))) {
     char *cp;
 
     if ((cp = strstr (*str, old))) {


@@ -1055,7 +1080,8 @@ replace_substring (char **str, const char *old, const char *new) {
  * Remove a name=value parameter, given just its name, from a header value.
  */
 char *
  * Remove a name=value parameter, given just its name, from a header value.
  */
 char *

-remove_parameter (char *str, const char *name) {
+remove_parameter (char *str, const char *name)
+{

     /* It looks to me, based on the BNF in RFC 2045, than there can't
        be whitespace between the parameter name and the "=", or
        between the "=" and the parameter value. */
     /* It looks to me, based on the BNF in RFC 2045, than there can't
        be whitespace between the parameter name and the "=", or
        between the "=" and the parameter value. */


@@ -1104,7 +1130,8 @@ remove_parameter (char *str, const char *name) {
  * 8 bit.
  */
 static int
  * 8 bit.
  */
 static int

-fix_composite_cte (CT ct, int *message_mods) {
+fix_composite_cte (CT ct, int *message_mods)
+{

     int status = OK;
 
     if (ct->c_type == CT_MESSAGE  ||  ct->c_type == CT_MULTIPART) {
     int status = OK;
 
     if (ct->c_type == CT_MESSAGE  ||  ct->c_type == CT_MULTIPART) {


@@ -1176,13 +1203,14 @@ fix_composite_cte (CT ct, int *message_mods) {
  * Set content encoding.
  */
 static int
  * Set content encoding.
  */
 static int

-set_ce (CT ct, int encoding) {
+set_ce (CT ct, int encoding)
+{

     const char *ce = ce_str (encoding);
     const struct str2init *ctinit = get_ce_method (ce);
 
     if (ctinit) {
         char *cte = concat (" ", ce, "\n", NULL);
     const char *ce = ce_str (encoding);
     const struct str2init *ctinit = get_ce_method (ce);
 
     if (ctinit) {
         char *cte = concat (" ", ce, "\n", NULL);

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

         HF hf;
         /* Decoded contents might be in ct->c_cefile.ce_file, if the
            caller is decode_text_parts ().  Save because we'll
         HF hf;
         /* Decoded contents might be in ct->c_cefile.ce_file, if the
            caller is decode_text_parts ().  Save because we'll


@@ -1209,7 +1237,7 @@ set_ce (CT ct, int encoding) {
         /* Update/add Content-Transfer-Encoding header field. */
         for (hf = ct->c_first_hf; hf; hf = hf->next) {
             if (! strcasecmp (ENCODING_FIELD, hf->name)) {
         /* Update/add Content-Transfer-Encoding header field. */
         for (hf = ct->c_first_hf; hf; hf = hf->next) {
             if (! strcasecmp (ENCODING_FIELD, hf->name)) {

-                found_cte = 1;
+                found_cte = true;

                 free (hf->value);
                 hf->value = cte;
             }
                 free (hf->value);
                 hf->value = cte;
             }


@@ -1233,7 +1261,8 @@ set_ce (CT ct, int encoding) {
  * Make sure each text part has a corresponding text/plain part.
  */
 static int
  * Make sure each text part has a corresponding text/plain part.
  */
 static int

-ensure_text_plain (CT *ct, CT parent, int *message_mods, int replacetextplain) {
+ensure_text_plain (CT *ct, CT parent, int *message_mods, int replacetextplain)
+{

     int status = OK;
 
     switch ((*ct)->c_type) {
     int status = OK;
 
     switch ((*ct)->c_type) {


@@ -1394,10 +1423,11 @@ ensure_text_plain (CT *ct, CT parent, int *message_mods, int replacetextplain) {
  */
 static int
 find_textplain_sibling (CT parent, int replacetextplain,
  */
 static int
 find_textplain_sibling (CT parent, int replacetextplain,

-                        int *new_subpart_number) {
+                        int *new_subpart_number)
+{

     struct multipart *mp = (struct multipart *) parent->c_ctparams;
     struct part *part, *prev;
     struct multipart *mp = (struct multipart *) parent->c_ctparams;
     struct part *part, *prev;

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

 
     for (prev = part = mp->mp_parts; part; part = part->mp_next) {
         ++*new_subpart_number;
 
     for (prev = part = mp->mp_parts; part; part = part->mp_next) {
         ++*new_subpart_number;


@@ -1420,7 +1450,7 @@ find_textplain_sibling (CT parent, int replacetextplain,
                 free_content (old_part->mp_part);
                 free (old_part);
             } else {
                 free_content (old_part->mp_part);
                 free (old_part);
             } else {

-                has_text_plain = 1;
+                has_text_plain = true;

             }
             break;
         }
             }
             break;
         }


@@ -1435,7 +1465,8 @@ find_textplain_sibling (CT parent, int replacetextplain,
  * Insert a new text/plain part.
  */
 static int
  * Insert a new text/plain part.
  */
 static int

-insert_new_text_plain_part (CT ct, int new_subpart_number, CT parent) {
+insert_new_text_plain_part (CT ct, int new_subpart_number, CT parent)
+{

     struct multipart *mp = (struct multipart *) parent->c_ctparams;
     struct part *new_part;
 
     struct multipart *mp = (struct multipart *) parent->c_ctparams;
     struct part *new_part;
 


@@ -1464,7 +1495,8 @@ insert_new_text_plain_part (CT ct, int new_subpart_number, CT parent) {
  * Create a text/plain part to go along with non-plain sibling part.
  */
 static CT
  * Create a text/plain part to go along with non-plain sibling part.
  */
 static CT

-build_text_plain_part (CT encoded_part) {
+build_text_plain_part (CT encoded_part)
+{

     CT tp_part = divide_part (encoded_part);
     char *tmp_plain_file = NULL;
 
     CT tp_part = divide_part (encoded_part);
     char *tmp_plain_file = NULL;
 


@@ -1502,7 +1534,8 @@ build_text_plain_part (CT encoded_part) {
  * Slip new text/plain part into a new multipart/alternative.
  */
 static int
  * Slip new text/plain part into a new multipart/alternative.
  */
 static int

-insert_into_new_mp_alt (CT *ct, int *message_mods) {
+insert_into_new_mp_alt (CT *ct, int *message_mods)
+{

     CT tp_part = build_text_plain_part (*ct);
     int status = OK;
 
     CT tp_part = build_text_plain_part (*ct);
     int status = OK;
 


@@ -1542,7 +1575,8 @@ insert_into_new_mp_alt (CT *ct, int *message_mods) {
  * Clone a MIME part.
  */
 static CT
  * Clone a MIME part.
  */
 static CT

-divide_part (CT ct) {
+divide_part (CT ct)
+{

     CT new_part;
 
     NEW0(new_part);
     CT new_part;
 
     NEW0(new_part);


@@ -1572,7 +1606,8 @@ divide_part (CT ct) {
  * Copy the content info from one part to another.
  */
 static void
  * Copy the content info from one part to another.
  */
 static void

-copy_ctinfo (CI dest, CI src) {
+copy_ctinfo (CI dest, CI src)
+{

     PM s_pm, d_pm;
 
     dest->ci_type = src->ci_type ? mh_xstrdup (src->ci_type) : NULL;
     PM s_pm, d_pm;
 
     dest->ci_type = src->ci_type ? mh_xstrdup (src->ci_type) : NULL;


@@ -1598,14 +1633,15 @@ copy_ctinfo (CI dest, CI src) {
  * Decode content.
  */
 static int
  * Decode content.
  */
 static int

-decode_part (CT ct) {
+decode_part (CT ct)
+{

     char *tmp_decoded;
     int status;
     FILE *file;
     char *tempfile;
 
     if ((tempfile = m_mktemp2 (NULL, invo_name, NULL, &file)) == NULL) {
     char *tmp_decoded;
     int status;
     FILE *file;
     char *tempfile;
 
     if ((tempfile = m_mktemp2 (NULL, invo_name, NULL, &file)) == NULL) {

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

     }
     tmp_decoded = mh_xstrdup (tempfile);
     /* The following call will load ct->c_cefile.ce_file with the tmp
     }
     tmp_decoded = mh_xstrdup (tempfile);
     /* The following call will load ct->c_cefile.ce_file with the tmp


@@ -1628,7 +1664,8 @@ decode_part (CT ct) {
  * be in the future for other than text types.
  */
 static int
  * be in the future for other than text types.
  */
 static int

-reformat_part (CT ct, char *file, char *type, char *subtype, int c_type) {
+reformat_part (CT ct, char *file, char *type, char *subtype, int c_type)
+{

     int output_subtype, output_encoding;
     const char *reason = NULL;
     char *cp, *cf;
     int output_subtype, output_encoding;
     const char *reason = NULL;
     char *cp, *cf;


@@ -1694,7 +1731,8 @@ reformat_part (CT ct, char *file, char *type, char *subtype, int c_type) {
  * Fill in a multipart/alternative part.
  */
 static CT
  * Fill in a multipart/alternative part.
  */
 static CT

-build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
+build_multipart_alt (CT first_alt, CT new_part, int type, int subtype)
+{

     char *boundary_prefix = "----=_nmh-multipart";
     char *boundary = concat (boundary_prefix, first_alt->c_partno, NULL);
     char *boundary_indicator = "; boundary=";
     char *boundary_prefix = "----=_nmh-multipart";
     char *boundary = concat (boundary_prefix, first_alt->c_partno, NULL);
     char *boundary_indicator = "; boundary=";


@@ -1742,8 +1780,7 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
                      boundary_in_content (&new_part->c_cefile.ce_fp,
                                           new_part->c_cefile.ce_file,
                                           boundary)) == NOTOK) {
                      boundary_in_content (&new_part->c_cefile.ce_fp,
                                           new_part->c_cefile.ce_file,
                                           boundary)) == NOTOK) {

-                    free_content (ct);
-                    return NULL;
+                    goto return_null;

                 }
             }
 
                 }
             }
 


@@ -1754,8 +1791,7 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
                      boundary_in_content (&new_part->c_fp,
                                           new_part->c_file,
                                           boundary)) == NOTOK) {
                      boundary_in_content (&new_part->c_fp,
                                           new_part->c_file,
                                           boundary)) == NOTOK) {

-                    free_content (ct);
-                    return NULL;
+                    goto return_null;

                 }
             }
 
                 }
             }
 


@@ -1775,8 +1811,7 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
 
         if (found_boundary) {
             inform("giving up trying to find a unique boundary");
 
         if (found_boundary) {
             inform("giving up trying to find a unique boundary");

-            free_content (ct);
-            return NULL;
+            goto return_null;

         }
     }
 
         }
     }
 


@@ -1821,6 +1856,11 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
     free (boundary);
 
     return ct;
     free (boundary);
 
     return ct;

+
+return_null:
+    free_content(ct);
+    free(boundary);
+    return NULL;

 }
 
 
 }
 
 


@@ -1828,10 +1868,11 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
  * Check that the boundary does not appear in the content.
  */
 static int
  * Check that the boundary does not appear in the content.
  */
 static int

-boundary_in_content (FILE **fp, char *file, const char *boundary) {
+boundary_in_content (FILE **fp, char *file, const char *boundary)
+{

     char buffer[NMH_BUFSIZ];
     size_t bytes_read;
     char buffer[NMH_BUFSIZ];
     size_t bytes_read;

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

 
     /* free_content() will close *fp if we fopen it here. */
     if (! *fp  &&  (*fp = fopen (file, "r")) == NULL) {
 
     /* free_content() will close *fp if we fopen it here. */
     if (! *fp  &&  (*fp = fopen (file, "r")) == NULL) {


@@ -1842,7 +1883,7 @@ boundary_in_content (FILE **fp, char *file, const char *boundary) {
     fseeko (*fp, 0L, SEEK_SET);
     while ((bytes_read = fread (buffer, 1, sizeof buffer, *fp)) > 0) {
         if (find_str (buffer, bytes_read, boundary)) {
     fseeko (*fp, 0L, SEEK_SET);
     while ((bytes_read = fread (buffer, 1, sizeof buffer, *fp)) > 0) {
         if (find_str (buffer, bytes_read, boundary)) {

-            found_boundary = 1;
+            found_boundary = true;

             break;
         }
     }
             break;
         }
     }


@@ -1855,7 +1896,8 @@ boundary_in_content (FILE **fp, char *file, const char *boundary) {
  * Remove all non-Content headers.
  */
 static void
  * Remove all non-Content headers.
  */
 static void

-transfer_noncontent_headers (CT old, CT new) {
+transfer_noncontent_headers (CT old, CT new)
+{

     HF hp, hp_prev;
 
     hp_prev = hp = old->c_first_hf;
     HF hp, hp_prev;
 
     hp_prev = hp = old->c_first_hf;


@@ -1899,14 +1941,15 @@ transfer_noncontent_headers (CT old, CT new) {
  * Set content type.
  */
 static int
  * Set content type.
  */
 static int

-set_ct_type (CT ct, int type, int subtype, int encoding) {
+set_ct_type (CT ct, int type, int subtype, int encoding)
+{

     char *typename = ct_type_str (type);
     char *subtypename = ct_subtype_str (type, subtype);
     /* E.g, " text/plain" */
     char *type_subtypename = concat (" ", typename, "/", subtypename, NULL);
     /* E.g, " text/plain\n" */
     char *name_plus_nl = concat (type_subtypename, "\n", NULL);
     char *typename = ct_type_str (type);
     char *subtypename = ct_subtype_str (type, subtype);
     /* E.g, " text/plain" */
     char *type_subtypename = concat (" ", typename, "/", subtypename, NULL);
     /* E.g, " text/plain\n" */
     char *name_plus_nl = concat (type_subtypename, "\n", NULL);

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

     HF hf;
     const char *cp = NULL;
     char *ctline;
     HF hf;
     const char *cp = NULL;
     char *ctline;


@@ -1915,7 +1958,7 @@ set_ct_type (CT ct, int type, int subtype, int encoding) {
     /* Update/add Content-Type header field. */
     for (hf = ct->c_first_hf; hf; hf = hf->next) {
         if (! strcasecmp (TYPE_FIELD, hf->name)) {
     /* Update/add Content-Type header field. */
     for (hf = ct->c_first_hf; hf; hf = hf->next) {
         if (! strcasecmp (TYPE_FIELD, hf->name)) {

-            found_content_type = 1;
+            found_content_type = true;

             free (hf->value);
             hf->value = (cp = strchr (ct->c_ctline, ';'))
                 ?  concat (type_subtypename, cp, "\n", NULL)
             free (hf->value);
             hf->value = (cp = strchr (ct->c_ctline, ';'))
                 ?  concat (type_subtypename, cp, "\n", NULL)


@@ -1960,7 +2003,8 @@ set_ct_type (CT ct, int type, int subtype, int encoding) {
  */
 static int
 decode_text_parts (CT ct, int encoding, const char *decodetypes,
  */
 static int
 decode_text_parts (CT ct, int encoding, const char *decodetypes,

-                   int *message_mods) {
+                   int *message_mods)
+{

     int status = OK;
     int lf_line_endings = 0;
 
     int status = OK;
     int lf_line_endings = 0;
 


@@ -2080,23 +2124,24 @@ decode_text_parts (CT ct, int encoding, const char *decodetypes,
  * decodetypes (which came from the -decodetypes switch).
  */
 static int
  * decodetypes (which came from the -decodetypes switch).
  */
 static int

-should_decode(const char *decodetypes, const char *type, const char *subtype) {
+should_decode(const char *decodetypes, const char *type, const char *subtype)
+{

     /* Quick search for matching type[/subtype] in decodetypes:  bracket
        decodetypes with commas, then search for ,type, and ,type/subtype, in
        it. */
 
     /* Quick search for matching type[/subtype] in decodetypes:  bracket
        decodetypes with commas, then search for ,type, and ,type/subtype, in
        it. */
 

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

     char *delimited_decodetypes = concat(",", decodetypes, ",", NULL);
     char *delimited_type = concat(",", type, ",", NULL);
 
     if (nmh_strcasestr(delimited_decodetypes, delimited_type)) {
     char *delimited_decodetypes = concat(",", decodetypes, ",", NULL);
     char *delimited_type = concat(",", type, ",", NULL);
 
     if (nmh_strcasestr(delimited_decodetypes, delimited_type)) {

-        found_match = 1;
+        found_match = true;

     } else if (subtype != NULL) {
         char *delimited_type_subtype =
             concat(",", type, "/", subtype, ",", NULL);
 
         if (nmh_strcasestr(delimited_decodetypes, delimited_type_subtype)) {
     } else if (subtype != NULL) {
         char *delimited_type_subtype =
             concat(",", type, "/", subtype, ",", NULL);
 
         if (nmh_strcasestr(delimited_decodetypes, delimited_type_subtype)) {

-            found_match = 1;
+            found_match = true;

         }
         free(delimited_type_subtype);
     }
         }
         free(delimited_type_subtype);
     }


@@ -2115,7 +2160,8 @@ should_decode(const char *decodetypes, const char *type, const char *subtype) {
  *  to a string explaining why.
  */
 static int
  *  to a string explaining why.
  */
 static int

-content_encoding (CT ct, const char **reason) {
+content_encoding (CT ct, const char **reason)
+{

     CE ce = &ct->c_cefile;
     int encoding = CE_7BIT;
 
     CE ce = &ct->c_cefile;
     int encoding = CE_7BIT;
 


@@ -2174,7 +2220,8 @@ content_encoding (CT ct, const char **reason) {
  * Strip carriage returns from content.
  */
 static int
  * Strip carriage returns from content.
  */
 static int

-strip_crs (CT ct, int *message_mods) {
+strip_crs (CT ct, int *message_mods)
+{

     char *charset = content_charset (ct);
     int status = OK;
 
     char *charset = content_charset (ct);
     int status = OK;
 


@@ -2191,8 +2238,8 @@ strip_crs (CT ct, int *message_mods) {
         FILE **fp = NULL;
         size_t begin;
         size_t end;
         FILE **fp = NULL;
         size_t begin;
         size_t end;

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

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


@@ -2211,7 +2258,7 @@ strip_crs (CT ct, 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;

                 }
             }
         }
                 }
             }
         }


@@ -2231,13 +2278,13 @@ strip_crs (CT ct, int *message_mods) {
                    modify the content. */
                 char *cp;
                 size_t i;
                    modify the content. */
                 char *cp;
                 size_t i;

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

 
                 if (end > 0) { bytes_to_read -= bytes_read; }
 
                 for (i = 0, cp = buffer; i < bytes_read; ++i, ++cp) {
                     if (*cp == '\n'  &&  last_char_was_cr) {
 
                 if (end > 0) { bytes_to_read -= bytes_read; }
 
                 for (i = 0, cp = buffer; i < bytes_read; ++i, ++cp) {
                     if (*cp == '\n'  &&  last_char_was_cr) {

-                        has_crs = 1;
+                        has_crs = true;

                         break;
                     }
 
                         break;
                     }
 


@@ -2251,7 +2298,7 @@ strip_crs (CT ct, int *message_mods) {
                 char *tempfile = m_mktemp2 (NULL, invo_name, &fd, NULL);
 
                 if (tempfile == NULL) {
                 char *tempfile = m_mktemp2 (NULL, invo_name, &fd, NULL);
 
                 if (tempfile == NULL) {

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

                            get_temp_dir());
                 }
                 stripped_content_file = mh_xstrdup (tempfile);
                            get_temp_dir());
                 }
                 stripped_content_file = mh_xstrdup (tempfile);


@@ -2262,11 +2309,11 @@ strip_crs (CT ct, int *message_mods) {
                        0) {
                     char *cp;
                     size_t i;
                        0) {
                     char *cp;
                     size_t i;

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

 
                     for (i = 0, cp = buffer; i < bytes_read; ++i, ++cp) {
                         if (*cp == '\r') {
 
                     for (i = 0, cp = buffer; i < bytes_read; ++i, ++cp) {
                         if (*cp == '\r') {

-                            last_char_was_cr = 1;
+                            last_char_was_cr = true;

                         } else if (last_char_was_cr) {
                             if (*cp != '\n') {
                                 if (write (fd, "\r", 1) < 0) {
                         } else if (last_char_was_cr) {
                             if (*cp != '\n') {
                                 if (write (fd, "\r", 1) < 0) {


@@ -2276,12 +2323,12 @@ strip_crs (CT ct, int *message_mods) {
                             if (write (fd, cp, 1) < 0) {
                                 advise (tempfile, "write");
                             }
                             if (write (fd, cp, 1) < 0) {
                                 advise (tempfile, "write");
                             }

-                            last_char_was_cr = 0;
+                            last_char_was_cr = false;

                         } else {
                             if (write (fd, cp, 1) < 0) {
                                 advise (tempfile, "write");
                             }
                         } else {
                             if (write (fd, cp, 1) < 0) {
                                 advise (tempfile, "write");
                             }

-                            last_char_was_cr = 0;
+                            last_char_was_cr = false;

                         }
                     }
                 }
                         }
                     }
                 }


@@ -2290,6 +2337,7 @@ strip_crs (CT ct, int *message_mods) {
                     inform("unable to write temporary file %s, continuing...",
                               stripped_content_file);
                     (void) m_unlink (stripped_content_file);
                     inform("unable to write temporary file %s, continuing...",
                               stripped_content_file);
                     (void) m_unlink (stripped_content_file);

+                    free(stripped_content_file);

                     status = NOTOK;
                 } else {
                     /* Replace the decoded file with the converted one. */
                     status = NOTOK;
                 } else {
                     /* Replace the decoded file with the converted one. */


@@ -2327,19 +2375,20 @@ strip_crs (CT ct, int *message_mods) {
  * of the part C-T-E's.
  */
 static void
  * of the part C-T-E's.
  */
 static void

-update_cte (CT ct) {
+update_cte (CT ct)
+{

     const int least_restrictive_enc = least_restrictive_encoding (ct);
 
     if (least_restrictive_enc != CE_UNKNOWN  &&
         least_restrictive_enc != CE_7BIT) {
         char *cte = concat (" ", ce_str (least_restrictive_enc), "\n", NULL);
         HF hf;
     const int least_restrictive_enc = least_restrictive_encoding (ct);
 
     if (least_restrictive_enc != CE_UNKNOWN  &&
         least_restrictive_enc != CE_7BIT) {
         char *cte = concat (" ", ce_str (least_restrictive_enc), "\n", NULL);
         HF hf;

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

 
         /* Update/add Content-Transfer-Encoding header field. */
         for (hf = ct->c_first_hf; hf; hf = hf->next) {
             if (! strcasecmp (ENCODING_FIELD, hf->name)) {
 
         /* Update/add Content-Transfer-Encoding header field. */
         for (hf = ct->c_first_hf; hf; hf = hf->next) {
             if (! strcasecmp (ENCODING_FIELD, hf->name)) {

-                found_cte = 1;
+                found_cte = true;

                 free (hf->value);
                 hf->value = cte;
             }
                 free (hf->value);
                 hf->value = cte;
             }


@@ -2356,7 +2405,8 @@ update_cte (CT ct) {
  * within a message.
  */
 static int
  * within a message.
  */
 static int

-least_restrictive_encoding (CT ct) {
+least_restrictive_encoding (CT ct)
+{

     int encoding = CE_UNKNOWN;
 
     switch (ct->c_type) {
     int encoding = CE_UNKNOWN;
 
     switch (ct->c_type) {


@@ -2404,7 +2454,8 @@ least_restrictive_encoding (CT ct) {
  *   CE_8BIT is less restrictive than CE_7BIT.
  */
 static int
  *   CE_8BIT is less restrictive than CE_7BIT.
  */
 static int

-less_restrictive (int encoding, int second_encoding) {
+less_restrictive (int encoding, int second_encoding)
+{

     switch (second_encoding) {
     case CE_BINARY:
         return encoding != CE_BINARY;
     switch (second_encoding) {
     case CE_BINARY:
         return encoding != CE_BINARY;


@@ -2423,7 +2474,8 @@ less_restrictive (int encoding, int second_encoding) {
  * Convert character set of each part.
  */
 static int
  * Convert character set of each part.
  */
 static int

-convert_charsets (CT ct, char *dest_charset, int *message_mods) {
+convert_charsets (CT ct, char *dest_charset, int *message_mods)
+{

     int status = OK;
 
     switch (ct->c_type) {
     int status = OK;
 
     switch (ct->c_type) {


@@ -2488,7 +2540,8 @@ convert_charsets (CT ct, char *dest_charset, int *message_mods) {
  *    headers, respectively.
  */
 static int
  *    headers, respectively.
  */
 static int

-fix_always (CT ct, int *message_mods) {
+fix_always (CT ct, int *message_mods)
+{

     int status = OK;
 
     switch (ct->c_type) {
     int status = OK;
 
     switch (ct->c_type) {


@@ -2570,8 +2623,9 @@ fix_always (CT ct, int *message_mods) {
  * Factor out common code for loops in fix_filename_encoding().
  */
 static int
  * Factor out common code for loops in fix_filename_encoding().
  */
 static int

-fix_filename_param (char *name, char *value, PM *first_pm, PM *last_pm) {
-    int fixed = 0;
+fix_filename_param (char *name, char *value, PM *first_pm, PM *last_pm)
+{
+    bool fixed = false;

 
     if (has_prefix(value, "=?") && has_suffix(value, "?=")) {
         /* Looks like an RFC 2047 encoded parameter. */
 
     if (has_prefix(value, "=?") && has_suffix(value, "?=")) {
         /* Looks like an RFC 2047 encoded parameter. */


@@ -2580,7 +2634,7 @@ fix_filename_param (char *name, char *value, PM *first_pm, PM *last_pm) {
         if (decode_rfc2047 (value, decoded, sizeof decoded)) {
             /* Encode using RFC 2231. */
             replace_param (first_pm, last_pm, name, decoded, 0);
         if (decode_rfc2047 (value, decoded, sizeof decoded)) {
             /* Encode using RFC 2231. */
             replace_param (first_pm, last_pm, name, decoded, 0);

-            fixed = 1;
+            fixed = true;

         } else {
             inform("failed to decode %s parameter %s", name, value);
         }
         } else {
             inform("failed to decode %s parameter %s", name, value);
         }


@@ -2596,7 +2650,8 @@ fix_filename_param (char *name, char *value, PM *first_pm, PM *last_pm) {
  * headers, respectively.
  */
 static int
  * headers, respectively.
  */
 static int

-fix_filename_encoding (CT ct) {
+fix_filename_encoding (CT ct)
+{

     PM pm;
     HF hf;
     int fixed = 0;
     PM pm;
     HF hf;
     int fixed = 0;


@@ -2662,7 +2717,8 @@ fix_filename_encoding (CT ct) {
  */
 static int
 write_content (CT ct, const char *input_filename, char *outfile, FILE *outfp,
  */
 static int
 write_content (CT ct, const char *input_filename, char *outfile, FILE *outfp,

-               int modify_inplace, int message_mods) {
+               int modify_inplace, int message_mods)
+{

     int status = OK;
 
     if (modify_inplace) {
     int status = OK;
 
     if (modify_inplace) {


@@ -2739,7 +2795,8 @@ write_content (CT ct, const char *input_filename, char *outfile, FILE *outfp,
  * function to do it.  It touches the parts the decodetypes identifies.
  */
 static void
  * function to do it.  It touches the parts the decodetypes identifies.
  */
 static void

-set_text_ctparams(CT ct, char *decodetypes, int lf_line_endings) {
+set_text_ctparams(CT ct, char *decodetypes, int lf_line_endings)
+{

     switch (ct->c_type) {
     case CT_MULTIPART: {
         struct multipart *m = (struct multipart *) ct->c_ctparams;
     switch (ct->c_type) {
     case CT_MULTIPART: {
         struct multipart *m = (struct multipart *) ct->c_ctparams;


@@ -2775,7 +2832,8 @@ set_text_ctparams(CT ct, char *decodetypes, int lf_line_endings) {
  * use the standard MH backup file.
  */
 static int
  * use the standard MH backup file.
  */
 static int

-remove_file (const char *file) {
+remove_file (const char *file)
+{

     if (rmmproc) {
         char *rmm_command = concat (rmmproc, " ", file, NULL);
         int status = system (rmm_command);
     if (rmmproc) {
         char *rmm_command = concat (rmmproc, " ", file, NULL);
         int status = system (rmm_command);


@@ -2794,7 +2852,8 @@ remove_file (const char *file) {
  * Output formatted message to user.
  */
 static void
  * Output formatted message to user.
  */
 static void

-report (char *what, char *partno, char *filename, char *message, ...) {
+report (char *what, char *partno, char *filename, char *message, ...)
+{

     va_list args;
     char *fmt;
 
     va_list args;
     char *fmt;