Add gcc's malloc function attribute.

[nmh] / uip / mhfixmsg.c

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 47ae44b4458efb5e269a349b53bcc9be836e93e5..88dfb153b9c7ba6e1f78dd6a4f08c545ea5898b4 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,10 +6,17 @@
  */
 
 #include <h/mh.h>
  */
 
 #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/mime.h>
 #include <h/mhparse.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 "mhfree.h"
+#include "mhoutsbr.h"
+#include "mhshowsbr.h"

 #include <fcntl.h>
 
 #define MHFIXMSG_SWITCHES \
 #include <fcntl.h>
 
 #define MHFIXMSG_SWITCHES \


@@ -61,15 +68,9 @@ extern int bogus_mp_content;                  /* flag from InitMultiPart */
 /* flags to/from parse_header_attrs */
 extern int suppress_extraneous_trailing_semicolon_warning;
 
 /* flags to/from parse_header_attrs */
 extern int suppress_extraneous_trailing_semicolon_warning;
 

-/* mhoutsbr.c */
-int output_message_fp (CT, FILE *, char *);
-

 /* mhmisc.c */
 void flush_errors (void);
 
 /* mhmisc.c */
 void flush_errors (void);
 

-/* mhfree.c */
-extern CT *cts;
-

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


@@ -124,7 +125,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);
 
 


@@ -231,11 +233,10 @@ main (int argc, char **argv) {
                     adios (NULL, "missing argument to %s", argp[-2]);
                 }
                 if (! strncasecmp (cp, "multipart/", 10)  ||
                     adios (NULL, "missing argument to %s", argp[-2]);
                 }
                 if (! strncasecmp (cp, "multipart/", 10)  ||

-                    ! strncasecmp (cp, "message/", 8)) {
+                    ! strncasecmp (cp, "message/", 8))

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

-                } else if (! strchr (cp, '/')) {
+                if (! strchr (cp, '/'))

                     adios (NULL, "-fixtype requires type/subtype");
                     adios (NULL, "-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;


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

-            if (folder) {
+            if (folder)

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

-            } else {
-                folder = pluspath (cp);
-            }
+            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. */


@@ -764,11 +763,9 @@ get_multipart_boundary (CT ct, char **part_boundary) {
             }
         }
 
             }
         }
 

-        if (! end_boundary  &&  begin > (off_t) (ct->c_begin + sizeof buffer)) {
-            begin -= sizeof buffer;
-        } else {
+        if (end_boundary  ||  begin <= (off_t) (ct->c_begin + sizeof buffer))

             break;
             break;

-        }
+        begin -= sizeof buffer;

     }
 
     /* Get boundary at beginning of multipart. */
     }
 
     /* Get boundary at beginning of multipart. */


@@ -819,7 +816,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) {


@@ -838,10 +835,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++;


@@ -853,7 +851,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 */
             }
 


@@ -872,7 +870,7 @@ replace_boundary (CT ct, char *file, char *boundary) {
                                           strlen(new_ctline) + 1,
                                           ct->c_ctinfo.ci_first_pm, NULL, 0);
                 fprintf (fpout, "%s:%s%s\n", np, new_ctline,
                                           strlen(new_ctline) + 1,
                                           ct->c_ctinfo.ci_first_pm, NULL, 0);
                 fprintf (fpout, "%s:%s%s\n", np, new_ctline,

-                        new_params ? new_params : "");
+                        FENDNULL(new_params));

                free(new_ctline);
                 mh_xfree(new_params);
             }
                free(new_ctline);
                 mh_xfree(new_params);
             }


@@ -1014,10 +1012,8 @@ fix_types (CT ct, svector_t fixtypes, int *message_mods) {
                                                 type, ct_type_subtype);
                                     }
                                     break;
                                                 type, ct_type_subtype);
                                     }
                                     break;

-                                } else {
-                                    inform("did not find %s in %s",
-                                            type, hf->value);

                                 }
                                 }

+                                inform("did not find %s in %s", type, hf->value);

                             }
                         }
                     }
                             }
                         }
                     }


@@ -1354,11 +1350,9 @@ ensure_text_plain (CT *ct, CT parent, int *message_mods, int replacetextplain) {
                                        multipart/alternative. */
                                     remove_parameter (hf->value, "type");
                                     break;
                                        multipart/alternative. */
                                     remove_parameter (hf->value, "type");
                                     break;

-                                } else {
-                                    inform("did not find multipart/"
-                                                  "related in header %s",
-                                            hf->value);

                                 }
                                 }

+                                inform("did not find multipart/"
+                                    "related in header %s", hf->value);

                             }
                         }
                     } else {
                             }
                         }
                     } else {


@@ -1663,7 +1657,7 @@ reformat_part (CT ct, char *file, char *type, char *subtype, int c_type) {
     if (strchr (cf, '>')) {
         inform("'>' prohibited in \"%s\",\nplease fix your "
                 "%s-format-%s/%s profile entry", cf, invo_name, type,
     if (strchr (cf, '>')) {
         inform("'>' prohibited in \"%s\",\nplease fix your "
                 "%s-format-%s/%s profile entry", cf, invo_name, type,

-                subtype ? subtype : "");
+                FENDNULL(subtype));

 
         return NOTOK;
     }
 
         return NOTOK;
     }


@@ -1780,7 +1774,7 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
                 snprintf (buffer2, sizeof buffer2, "%d", serial);
                 boundary =
                     concat (boundary_prefix,
                 snprintf (buffer2, sizeof buffer2, "%d", serial);
                 boundary =
                     concat (boundary_prefix,

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

                             "-", buffer2,  NULL);
             }
         }
                             "-", buffer2,  NULL);
             }
         }


@@ -2023,8 +2017,7 @@ decode_text_parts (CT ct, int encoding, const char *decodetypes,
                         report (NULL, ct->c_partno, ct->c_file,
                                 "will not decode%s because it is binary (%s)",
                                 ct->c_partno  ?  ""
                         report (NULL, ct->c_partno, ct->c_file,
                                 "will not decode%s because it is binary (%s)",
                                 ct->c_partno  ?  ""

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

                                 reason);
                     }
                     (void) m_unlink (ct->c_cefile.ce_file);
                                 reason);
                     }
                     (void) m_unlink (ct->c_cefile.ce_file);


@@ -2038,8 +2031,7 @@ decode_text_parts (CT ct, int encoding, const char *decodetypes,
                         report (NULL, ct->c_partno, ct->c_file,
                                 "will not decode%s because it is 8bit",
                                 ct->c_partno  ?  ""
                         report (NULL, ct->c_partno, ct->c_file,
                                 "will not decode%s because it is 8bit",
                                 ct->c_partno  ?  ""

-                                              :  ct->c_ctline  ?  ct->c_ctline
-                                                               :  "");
+                                              :  (FENDNULL(ct->c_ctline)));

                     }
                     (void) m_unlink (ct->c_cefile.ce_file);
                     free (ct->c_cefile.ce_file);
                     }
                     (void) m_unlink (ct->c_cefile.ce_file);
                     free (ct->c_cefile.ce_file);


@@ -2058,7 +2050,7 @@ decode_text_parts (CT ct, int encoding, const char *decodetypes,
                         ++*message_mods;
                         if (verbosw) {
                             report (NULL, ct->c_partno, ct->c_file, "decode%s",
                         ++*message_mods;
                         if (verbosw) {
                             report (NULL, ct->c_partno, ct->c_file, "decode%s",

-                                    ct->c_ctline ? ct->c_ctline : "");
+                                    FENDNULL(ct->c_ctline));

                         }
                         if (lf_line_endings) {
                             strip_crs (ct, message_mods);
                         }
                         if (lf_line_endings) {
                             strip_crs (ct, message_mods);


@@ -2165,13 +2157,14 @@ content_encoding (CT ct, const char **reason) {
                         *reason = "";
                     }
                     break;
                         *reason = "";
                     }
                     break;

-                } else if (*cp == '\n') {
+                }
+                if (*cp == '\n') {

                     line_len = 0;
                 } else if (! isascii ((unsigned char) *cp)) {
                     encoding = CE_8BIT;
                 }
 
                     line_len = 0;
                 } else if (! isascii ((unsigned char) *cp)) {
                     encoding = CE_8BIT;
                 }
 

-                last_char_was_cr = *cp == '\r'  ?  1  :  0;
+                last_char_was_cr = *cp == '\r';

             }
         }
 
             }
         }
 


@@ -2254,7 +2247,7 @@ strip_crs (CT ct, int *message_mods) {
                         break;
                     }
 
                         break;
                     }
 

-                    last_char_was_cr = *cp == '\r'  ?  1  :  0;
+                    last_char_was_cr = *cp == '\r';

                 }
             }
 
                 }
             }
 


@@ -2814,7 +2807,7 @@ report (char *what, char *partno, char *filename, char *message, ...) {
     if (verbosw) {
         va_start (args, message);
         fmt = concat (filename, partno ? " part " : ", ",
     if (verbosw) {
         va_start (args, message);
         fmt = concat (filename, partno ? " part " : ", ",

-                      partno ? partno : "", partno ? ", " : "", message, NULL);
+                      FENDNULL(partno), partno ? ", " : "", message, NULL);

 
         advertise (what, NULL, fmt, args);
 
 
         advertise (what, NULL, fmt, args);