Add missing variable initializations on fmt_scan().

[nmh] / uip / mhfixmsg.c

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 069e3284fe39cae7f1fc6f1968bebf3727100844..2a705114e0fe8cb95e3e5db7c31ec457c3f47d82 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -53,15 +53,11 @@ int debugsw; /* Needed by 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 */
 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 */

-CT parse_mime (char *);

 void reverse_parts (CT);
 
 /* mhoutsbr.c */
 int output_message (CT, char *);
 
 void reverse_parts (CT);
 
 /* mhoutsbr.c */
 int output_message (CT, char *);
 

-/* mhshowsbr.c */
-int show_content_aux (CT, int, char *, char *);
-

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


@@ -1095,40 +1091,25 @@ reformat_part (CT ct, char *file, char *type, char *subtype, int c_type) {
        Could show_multi() in mhshowsbr.c avoid this? */
 
     /* Check for invo_name-format-type/subtype. */
        Could show_multi() in mhshowsbr.c avoid this? */
 
     /* Check for invo_name-format-type/subtype. */

-    cp = concat (invo_name, "-format-", type, "/", subtype, NULL);
-    if ((cf = context_find (cp))  &&  *cf != '\0') {
+    if ((cf = context_find_by_type ("format", type, subtype)) == NULL) {
+        if (verbosw) {
+            advise (NULL, "Don't know how to convert %s, there is no "
+                    "%s-format-%s/%s profile entry",
+                    ct->c_file, invo_name, type, subtype);
+        }
+        return NOTOK;
+    } else {

         if (strchr (cf, '>')) {
         if (strchr (cf, '>')) {

-            free (cp);

             advise (NULL, "'>' prohibited in \"%s\",\nplease fix your "
                     "%s-format-%s/%s profile entry", cf, invo_name, type,
             advise (NULL, "'>' prohibited in \"%s\",\nplease fix your "
                     "%s-format-%s/%s profile entry", cf, invo_name, type,

-                    subtype);
-            return NOTOK;
-        }
-    } else {
-        free (cp);
-
-        /* Check for invo_name-format-type. */
-        cp = concat (invo_name, "-format-", type, NULL);
-        if (! (cf = context_find (cp))  ||  *cf == '\0') {
-            free (cp);
-            if (verbosw) {
-                advise (NULL, "Don't know how to convert %s, there is no "
-                        "%s-format-%s/%s profile entry",
-                        ct->c_file, invo_name, type, subtype);
-            }
-            return NOTOK;
-        }
+                    subtype ? subtype : "");

 
 

-        if (strchr (cf, '>')) {
-            free (cp);
-            advise (NULL, "'>' prohibited in \"%s\"", cf);

             return NOTOK;
         }
     }
             return NOTOK;
         }
     }

-    free (cp);

 
     cp = concat (cf, " >", file, NULL);
 
     cp = concat (cf, " >", file, NULL);

-    status = show_content_aux (ct, 0, cp, NULL);
+    status = show_content_aux (ct, 0, cp, NULL, NULL);

     free (cp);
 
     /* Unlink decoded content tmp file and free its filename to avoid
     free (cp);
 
     /* Unlink decoded content tmp file and free its filename to avoid


@@ -1163,12 +1144,9 @@ reformat_part (CT ct, char *file, char *type, char *subtype, int c_type) {
 /* Identifies 7bit or 8bit content based on charset. */
 static int
 charset_encoding (CT ct) {
 /* Identifies 7bit or 8bit content based on charset. */
 static int
 charset_encoding (CT ct) {

-    /* norm_charmap() is case sensitive. */
-    char *charset = upcase (content_charset (ct));

     int encoding =
     int encoding =

-        strcmp (norm_charmap (charset), "US-ASCII")  ?  CE_8BIT  :  CE_7BIT;
+        strcasecmp (content_charset (ct), "US-ASCII")  ?  CE_8BIT  :  CE_7BIT;

 
 

-    free (charset);

     return encoding;
 }
 
     return encoding;
 }
 


@@ -1594,8 +1572,7 @@ content_encoding (CT ct, const char **reason) {
 
 static int
 strip_crs (CT ct, int *message_mods) {
 
 static int
 strip_crs (CT ct, int *message_mods) {

-    /* norm_charmap() is case sensitive. */
-    char *charset = upcase (content_charset (ct));
+    char *charset = content_charset (ct);

     int status = OK;
 
     /* Only strip carriage returns if content is ASCII or another
     int status = OK;
 
     /* Only strip carriage returns if content is ASCII or another


@@ -1603,10 +1580,10 @@ strip_crs (CT ct, int *message_mods) {
        LF.  We can include UTF-8 here because if the high-order bit of
        a UTF-8 byte is 0, then it must be a single-byte ASCII
        character. */
        LF.  We can include UTF-8 here because if the high-order bit of
        a UTF-8 byte is 0, then it must be a single-byte ASCII
        character. */

-    if (! strcmp (norm_charmap (charset), "US-ASCII")  ||
-        ! strncmp (norm_charmap (charset), "ISO-8859-", 9)  ||
-        ! strncmp (norm_charmap (charset), "UTF-8", 5)  ||
-        ! strncmp (norm_charmap (charset), "WINDOWS-12", 10)) {
+    if (! strcasecmp (charset, "US-ASCII")  ||
+        ! strcasecmp (charset, "UTF-8")  ||
+        ! strncasecmp (charset, "ISO-8859-", 9)  ||
+        ! strncasecmp (charset, "WINDOWS-12", 10)) {

         char **file = NULL;
         FILE **fp = NULL;
         size_t begin;
         char **file = NULL;
         FILE **fp = NULL;
         size_t begin;


@@ -1730,7 +1707,6 @@ strip_crs (CT ct, int *message_mods) {
         }
     }
 
         }
     }
 

-    free (charset);

     return status;
 }
 
     return status;
 }