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

diff --git a/lib-mime/rfc2231.c b/lib-mime/rfc2231.c
index ff6a02c..287c1d6 100644
--- a/lib-mime/rfc2231.c
+++ b/lib-mime/rfc2231.c
@@ -36,17 +36,12 @@
  *
  */
 
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
 
 #include "charset.h"
+#include "mutt.h"
 
 typedef struct rfc2231_param {
     struct rfc2231_param *next;
@@ -133,14 +128,13 @@ rfc2231_list_insert(rfc2231_param **list, rfc2231_param *par)
     *list = par;
 }
 
-static void purge_empty_parameters(PARAMETER **headp)
+static void purge_empty_parameters(parameter_t **headp)
 {
     while (*headp) {
-        PARAMETER *p = *headp;
+        parameter_t *p = *headp;
 
         if (!p->attribute || !p->value) {
-            *headp = p->next;
-            p->next = NULL;
+            p = parameter_list_pop(headp);
             parameter_delete(&p);
         } else {
             headp = &(*headp)->next;
@@ -151,7 +145,7 @@ static void purge_empty_parameters(PARAMETER **headp)
 /* process continuation parameters */
 /* XXX: MC: not read */
 static void
-rfc2231_join_continuations(PARAMETER **head, rfc2231_param *par)
+rfc2231_join_continuations(parameter_t **head, rfc2231_param *par)
 {
     rfc2231_param *q;
 
@@ -181,7 +175,7 @@ rfc2231_join_continuations(PARAMETER **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;
@@ -206,11 +200,11 @@ rfc2231_join_continuations(PARAMETER **head, rfc2231_param *par)
 /****************************************************************************/
 
 /* XXX: MC: not read */
-void rfc2231_decode_parameters (PARAMETER ** headp)
+void rfc2231_decode_parameters (parameter_t ** headp)
 {
-    PARAMETER *head = NULL;
-    PARAMETER **last;
-    PARAMETER *p, *q;
+    parameter_t *head = NULL;
+    parameter_t **last;
+    parameter_t *p, *q;
 
     rfc2231_param *conthead = NULL;
     rfc2231_param *conttmp;
@@ -239,11 +233,11 @@ void rfc2231_decode_parameters (PARAMETER ** 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 (ascii_strcasecmp (AssumedCharset, "us-ascii"))
-                    mutt_convert_nonmime_string (&p->value);
+            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);
             }
 
             *last = p;