X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=2ecf57765d7ba77b4a5691defe1cecbc12898a0f;hp=0f37639659b29a82e45fdcae79361e84262e156c;hb=6c9a7df6f0a909d987634888cbb7ccd9b17ecc09;hpb=3766db5f849cea008b1cd3d532c712aeb17aa062

diff --git a/handler.c b/handler.c
index 0f37639..2ecf577 100644
--- a/handler.c
+++ b/handler.c
@@ -483,7 +483,7 @@ static void enriched_flush (struct enriched_state *stte, int wrap)
       stte->line_max = stte->line_used;
       p_realloc(&stte->line, stte->line_max + 1);
     }
-    strcat (stte->line, stte->buffer);  /* __STRCAT_CHECKED__ */
+    m_strcat(stte->line, stte->line_max + 1, stte->buffer);
     stte->line_len += stte->word_len;
     stte->word_len = 0;
     stte->buff_used = 0;
@@ -1250,12 +1250,11 @@ void mutt_decode_attachment (BODY * b, STATE * s)
     if (s->flags & M_CHARCONV) {
       const char *charset = parameter_getval(b->parameter, "charset");
 
-      if (!option (OPTSTRICTMIME) && !charset)
+      if (!charset)
         charset = charset_getfirst(AssumedCharset);
       if (charset && Charset)
         cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM);
-    }
-    else {
+    } else {
       if (b->file_charset)
         cd = mutt_iconv_open (Charset, b->file_charset, M_ICONV_HOOK_FROM);
     }
@@ -1330,7 +1329,7 @@ int mutt_body_handler (BODY * b, STATE * s)
       plaintext = 1;
   }
   else if (b->type == TYPEMESSAGE) {
-    if (mutt_is_message_type (b->type, b->subtype))
+    if (mutt_is_message_type (b))
       handler = message_handler;
     else if (!ascii_strcasecmp ("delivery-status", b->subtype))
       plaintext = 1;
@@ -1415,7 +1414,7 @@ int mutt_body_handler (BODY * b, STATE * s)
       if (decode) {
         b->length = ftello (s->fpout);
         b->offset = 0;
-        fclose (s->fpout);
+        m_fclose(&s->fpout);
 
         /* restore final destination and substitute the tempfile for input */
         s->fpout = fp;
@@ -1439,7 +1438,7 @@ int mutt_body_handler (BODY * b, STATE * s)
         b->offset = tmpoffset;
 
         /* restore the original source stream */
-        fclose (s->fpin);
+        m_fclose(&s->fpin);
         s->fpin = fp;
       }
     }