mts/smtp/smtp.c: Replace int with bool.

[nmh] / uip / mhfixmsg.c

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index aed480eadf33168901cb9b30bbf38babbff96429..7a298e0be15f9e25f72e712881140c295e309a4e 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -9,11 +9,13 @@
 #include <h/fmt_scan.h>
 #include <h/mime.h>
 #include <h/mhparse.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 <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"
+#include "mhmisc.h"

 #include "mhfree.h"
 #include "mhoutsbr.h"
 #include "mhshowsbr.h"
 #include "mhfree.h"
 #include "mhoutsbr.h"
 #include "mhshowsbr.h"


@@ -61,16 +63,6 @@ int debugsw; /* Needed by mhparse.c. */
 
 #define quitser pipeser
 
 
 #define quitser pipeser
 

-/* mhparse.c */
-extern int skip_mp_cte_check;                 /* flag to InitMultiPart */
-extern int suppress_bogus_mp_content_warning; /* flag to InitMultiPart */
-extern int bogus_mp_content;                  /* flag from InitMultiPart */
-/* flags to/from parse_header_attrs */
-extern int suppress_extraneous_trailing_semicolon_warning;
-
-/* mhmisc.c */
-void flush_errors (void);
-

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


@@ -87,8 +79,8 @@ typedef struct fix_transformations {
     char *textcharset;
 } fix_transformations;
 
     char *textcharset;
 } fix_transformations;
 

-int mhfixmsgsbr (CT *, char *, const fix_transformations *, FILE **, char *,
-                 FILE **);
+static int mhfixmsgsbr (CT *, char *, const fix_transformations *,
+    FILE **, char *, FILE **);

 static int fix_boundary (CT *, int *);
 static int copy_input_to_output (const char *, FILE *, const char *, FILE *);
 static int get_multipart_boundary (CT, char **);
 static int fix_boundary (CT *, int *);
 static int copy_input_to_output (const char *, FILE *, const char *, FILE *);
 static int get_multipart_boundary (CT, char **);


@@ -116,7 +108,7 @@ static int should_decode(const char *, const char *, const char *);
 static int content_encoding (CT, const char **);
 static int strip_crs (CT, int *);
 static void update_cte (CT);
 static int content_encoding (CT, const char **);
 static int strip_crs (CT, int *);
 static void update_cte (CT);

-static int least_restrictive_encoding (CT);
+static int least_restrictive_encoding (CT) PURE;

 static int less_restrictive (int, int);
 static int convert_charsets (CT, char *, int *);
 static int fix_always (CT, int *);
 static int less_restrictive (int, int);
 static int convert_charsets (CT, char *, int *);
 static int fix_always (CT, int *);


@@ -125,7 +117,8 @@ static int fix_filename_encoding (CT);
 static int write_content (CT, const char *, char *, FILE *, int, int);
 static void set_text_ctparams(CT, char *, int);
 static int remove_file (const char *);
 static int write_content (CT, const char *, char *, FILE *, int, int);
 static void set_text_ctparams(CT, char *, int);
 static int remove_file (const char *);

-static void report (char *, char *, char *, char *, ...);
+static void report (char *, char *, char *, char *, ...)
+    CHECK_PRINTF(4, 5);

 static void pipeser (int);
 
 
 static void pipeser (int);
 
 


@@ -151,7 +144,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;


@@ -166,7 +159,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]",


@@ -179,7 +172,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;


@@ -188,7 +181,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:


@@ -196,7 +189,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;


@@ -208,7 +201,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;


@@ -229,14 +222,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)  ||
                 }
                 if (! strncasecmp (cp, "multipart/", 10)  ||

-                    ! strncasecmp (cp, "message/", 8)) {
-                    adios (NULL, "-fixtype %s not allowed", cp);
-                } else if (! strchr (cp, '/')) {
-                    adios (NULL, "-fixtype requires type/subtype");
-                }
+                    ! strncasecmp (cp, "message/", 8))
+                    die("-fixtype %s not allowed", cp);
+                if (! strchr (cp, '/'))
+                    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;


@@ -254,19 +246,19 @@ 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:
                 }
                 continue;
             case NRPRCSW:


@@ -287,11 +279,9 @@ main (int argc, char **argv) {
             }
         }
         if (*cp == '+' || *cp == '@') {
             }
         }
         if (*cp == '+' || *cp == '@') {

-            if (folder) {
-                adios (NULL, "only one folder at a time!");
-            } else {
-                folder = pluspath (cp);
-            }
+            if (folder)
+                die("only one folder at a time!");
+            folder = pluspath (cp);

         } else {
             if (*cp == '/') {
                 /* Interpret a full path as a filename, not a message. */
         } else {
             if (*cp == '/') {
                 /* Interpret a full path as a filename, not a message. */


@@ -309,19 +299,19 @@ main (int argc, char **argv) {
      * Read the standard profile setup
      */
     if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {
      * Read the standard profile setup
      */
     if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {

-        readconfig ((struct node **) 0, fp, cp, 0);
+        readconfig(NULL, fp, cp, 0);

         fclose (fp);
     }
 
         fclose (fp);
     }
 

-    suppress_bogus_mp_content_warning = skip_mp_cte_check = 1;
-    suppress_extraneous_trailing_semicolon_warning = 1;
+    suppress_bogus_mp_content_warning = skip_mp_cte_check = true;
+    suppress_extraneous_trailing_semicolon_warning = true;

 
     if (! context_find ("path")) {
         free (path ("./", TFOLDER));
     }
 
     if (file && msgs.size) {
 
     if (! context_find ("path")) {
         free (path ("./", TFOLDER));
     }
 
     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) {


@@ -351,7 +341,7 @@ main (int argc, char **argv) {
             using_stdin = 1;
 
             if ((cp = m_mktemp2 (NULL, invo_name, &fd, NULL)) == NULL) {
             using_stdin = 1;
 
             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);


@@ -361,7 +351,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");

             }
         }
 
             }
         }
 


@@ -416,12 +406,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 */


@@ -487,7 +477,10 @@ main (int argc, char **argv) {
 
     if (*cts) {
         for (ctp = cts; *ctp; ++ctp) {
 
     if (*cts) {
         for (ctp = cts; *ctp; ++ctp) {

-            status += mhfixmsgsbr (ctp, maildir, &fx, &infp, outfile, &outfp);
+            status =
+                mhfixmsgsbr (ctp, maildir, &fx, &infp, outfile, &outfp) == OK
+                ? 0
+                : 1;

             free_content (*ctp);
 
             if (using_stdin) {
             free_content (*ctp);
 
             if (using_stdin) {


@@ -503,7 +496,7 @@ main (int argc, char **argv) {
         status = 1;
     }
 
         status = 1;
     }
 

-    mh_xfree(maildir);
+    free(maildir);

     free (cts);
 
     if (fx.fixtypes != NULL) { svector_free (fx.fixtypes); }
     free (cts);
 
     if (fx.fixtypes != NULL) { svector_free (fx.fixtypes); }


@@ -514,7 +507,7 @@ main (int argc, char **argv) {
     free (folder);
     free (arguments);
 
     free (folder);
     free (arguments);
 

-    done (status);
+    done (status == OK ? 0 : 1);

     return NOTOK;
 }
 
     return NOTOK;
 }
 


@@ -522,7 +515,7 @@ main (int argc, char **argv) {
 /*
  * Apply transformations to one message.
  */
 /*
  * Apply transformations to one message.
  */

-int
+static int

 mhfixmsgsbr (CT *ctp, char *maildir, const fix_transformations *fx,
              FILE **infp, char *outfile, FILE **outfp) {
     /* Store input filename in case one of the transformations, i.e.,
 mhfixmsgsbr (CT *ctp, char *maildir, const fix_transformations *fx,
              FILE **infp, char *outfile, FILE **outfp) {
     /* Store input filename in case one of the transformations, i.e.,


@@ -549,12 +542,12 @@ mhfixmsgsbr (CT *ctp, char *maildir, const fix_transformations *fx,
             /* outfp will be closed by the caller */
             if ((tempfile = m_mktemp2 (NULL, invo_name, NULL, outfp)) ==
                 NULL) {
             /* 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 */
 


@@ -818,7 +811,7 @@ replace_boundary (CT ct, char *file, char *boundary) {
     int compnum, state;
     char buf[NMH_BUFSIZ], name[NAMESZ];
     char *np, *vp;
     int compnum, state;
     char buf[NMH_BUFSIZ], name[NAMESZ];
     char *np, *vp;

-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;

     int status = OK;
 
     if (ct->c_file == NULL) {
     int status = OK;
 
     if (ct->c_file == NULL) {


@@ -837,10 +830,11 @@ replace_boundary (CT ct, char *file, char *boundary) {
         return NOTOK;
     }
 
         return NOTOK;
     }
 

+    gstate = m_getfld_state_init(fpin);

     for (compnum = 1;;) {
         int bufsz = (int) sizeof buf;
 
     for (compnum = 1;;) {
         int bufsz = (int) sizeof buf;
 

-        switch (state = m_getfld (&gstate, name, buf, &bufsz, fpin)) {
+        switch (state = m_getfld2(&gstate, name, buf, &bufsz)) {

         case FLD:
         case FLDPLUS:
             compnum++;
         case FLD:
         case FLDPLUS:
             compnum++;


@@ -852,7 +846,7 @@ replace_boundary (CT ct, char *file, char *boundary) {
             /* if necessary, get rest of field */
             while (state == FLDPLUS) {
                 bufsz = sizeof buf;
             /* if necessary, get rest of field */
             while (state == FLDPLUS) {
                 bufsz = sizeof buf;

-                state = m_getfld (&gstate, name, buf, &bufsz, fpin);
+                state = m_getfld2(&gstate, name, buf, &bufsz);

                 vp = add (buf, vp);     /* add to previous value */
             }
 
                 vp = add (buf, vp);     /* add to previous value */
             }
 


@@ -867,13 +861,13 @@ replace_boundary (CT ct, char *file, char *boundary) {
 
                new_ctline = concat(" ", ct->c_ctinfo.ci_type, "/",
                                    ct->c_ctinfo.ci_subtype, NULL);
 
                new_ctline = concat(" ", ct->c_ctinfo.ci_type, "/",
                                    ct->c_ctinfo.ci_subtype, NULL);

-               new_params = output_params(strlen(TYPE_FIELD) +
+               new_params = output_params(LEN(TYPE_FIELD) +

                                           strlen(new_ctline) + 1,
                                           ct->c_ctinfo.ci_first_pm, NULL, 0);
                 fprintf (fpout, "%s:%s%s\n", np, new_ctline,
                         FENDNULL(new_params));
                free(new_ctline);
                                           strlen(new_ctline) + 1,
                                           ct->c_ctinfo.ci_first_pm, NULL, 0);
                 fprintf (fpout, "%s:%s%s\n", np, new_ctline,
                         FENDNULL(new_params));
                free(new_ctline);

-                mh_xfree(new_params);
+                free(new_params);

             }
 
             free (vp);
             }
 
             free (vp);


@@ -1121,12 +1115,12 @@ fix_composite_cte (CT ct, int *message_mods) {
 
             for (hf = ct->c_first_hf; hf; hf = hf->next) {
                 char *name = hf->name;
 
             for (hf = ct->c_first_hf; hf; hf = hf->next) {
                 char *name = hf->name;

-                for (; *name && isspace ((unsigned char) *name); ++name) {
+                for (; isspace((unsigned char)*name); ++name) {

                     continue;
                 }
 
                 if (! strncasecmp (name, ENCODING_FIELD,
                     continue;
                 }
 
                 if (! strncasecmp (name, ENCODING_FIELD,

-                                   strlen (ENCODING_FIELD))) {
+                                   LEN(ENCODING_FIELD))) {

                     char *prefix = "Nmh-REPLACED-INVALID-";
                     HF h;
 
                     char *prefix = "Nmh-REPLACED-INVALID-";
                     HF h;
 


@@ -1612,7 +1606,7 @@ decode_part (CT ct) {
     char *tempfile;
 
     if ((tempfile = m_mktemp2 (NULL, invo_name, NULL, &file)) == NULL) {
     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


@@ -1749,8 +1743,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;

                 }
             }
 
                 }
             }
 


@@ -1761,8 +1754,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;

                 }
             }
 
                 }
             }
 


@@ -1782,8 +1774,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;

         }
     }
 
         }
     }
 


@@ -1828,6 +1819,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;

 }
 
 
 }
 
 


@@ -1869,7 +1865,7 @@ transfer_noncontent_headers (CT old, CT new) {
     while (hp) {
         HF next = hp->next;
 
     while (hp) {
         HF next = hp->next;
 

-        if (strncasecmp (XXX_FIELD_PRF, hp->name, strlen (XXX_FIELD_PRF))) {
+        if (strncasecmp (XXX_FIELD_PRF, hp->name, LEN(XXX_FIELD_PRF))) {

             if (hp == old->c_last_hf) {
                 if (hp == old->c_first_hf) {
                     old->c_last_hf =  old->c_first_hf = NULL;
             if (hp == old->c_last_hf) {
                 if (hp == old->c_first_hf) {
                     old->c_last_hf =  old->c_first_hf = NULL;


@@ -2258,7 +2254,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);


@@ -2297,13 +2293,14 @@ 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. */
                     if (ct->c_cefile.ce_file && ct->c_cefile.ce_unlink)
                         (void) m_unlink (ct->c_cefile.ce_file);
 
                     status = NOTOK;
                 } else {
                     /* Replace the decoded file with the converted one. */
                     if (ct->c_cefile.ce_file && ct->c_cefile.ce_unlink)
                         (void) m_unlink (ct->c_cefile.ce_file);
 

-                    mh_xfree(ct->c_cefile.ce_file);
+                    free(ct->c_cefile.ce_file);

                     ct->c_cefile.ce_file = stripped_content_file;
                     ct->c_cefile.ce_unlink = 1;
 
                     ct->c_cefile.ce_file = stripped_content_file;
                     ct->c_cefile.ce_unlink = 1;
 


@@ -2717,7 +2714,7 @@ write_content (CT ct, const char *input_filename, char *outfile, FILE *outfp,
                     }
                 } else {
                     inform("unable to remove input file %s, "
                     }
                 } else {
                     inform("unable to remove input file %s, "

-                       "not modifying it, continuing...", infile);
+                        "not modifying it, continuing...", infile);

                     (void) m_unlink (outfile);
                     status = NOTOK;
                 }
                     (void) m_unlink (outfile);
                     status = NOTOK;
                 }