X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc2231.c;h=287c1d6d38a76cd9ff2b6cc876d2e5720abe3c4b;hp=6bbd39a4130697edba313af230c43f35d88543df;hb=34a7c5a388523a65f55d6d50213bd4b735cfb25b;hpb=230399f9632c37b66c1c117a17e8327eae6b3235

diff --git a/lib-mime/rfc2231.c b/lib-mime/rfc2231.c
index 6bbd39a..287c1d6 100644
--- a/lib-mime/rfc2231.c
+++ b/lib-mime/rfc2231.c
@@ -36,10 +36,6 @@
  *
  */
 
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
@@ -179,7 +175,7 @@ rfc2231_join_continuations(parameter_t **head, rfc2231_param *par)
             vl = m_strlen(par->value);
 
             p_realloc(&value, l + vl + 1);
-            strcpy (value + l, par->value);   /* __STRCPY_CHECKED__ */
+            m_strcpy(value + l, vl + 1, par->value);
             l += vl;
 
             q = par->next;
@@ -237,9 +233,9 @@ void rfc2231_decode_parameters (parameter_t ** headp)
              * Internet Gateways.  So we actually decode it.
              */
 
-            if (option (OPTRFC2047PARAMS) && p->value && strstr (p->value, "=?"))
-                rfc2047_decode (&p->value);
-            else if (!option (OPTSTRICTMIME)) {
+            if (p->value && strstr(p->value, "=?")) {
+                rfc2047_decode(&p->value);
+            } else {
                 if (mime_which_token(AssumedCharset, -1) == MIME_US_ASCII)
                     mutt_convert_nonmime_string(&p->value);
             }