Move (un)?lists and (un)subscribe to MAlias.

[apps/madmutt.git] / lib-mime / rfc2231.c

diff --git a/lib-mime/rfc2231.c b/lib-mime/rfc2231.c
index ff6a02c..da50510 100644 (file)
--- 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 <lib-mime/mime.h>
 
 #include "charset.h"

+#include "mutt.h"

 
 typedef struct rfc2231_param {
     struct rfc2231_param *next;
 
 typedef struct rfc2231_param {
     struct rfc2231_param *next;


@@ -133,14 +128,13 @@ rfc2231_list_insert(rfc2231_param **list, rfc2231_param *par)
     *list = par;
 }
 
     *list = par;
 }
 

-static void purge_empty_parameters(PARAMETER **headp)
+static void purge_empty_parameters(parameter_t **headp)

 {
     while (*headp) {
 {
     while (*headp) {

-        PARAMETER *p = *headp;
+        parameter_t *p = *headp;

 
         if (!p->attribute || !p->value) {
 
         if (!p->attribute || !p->value) {

-            *headp = p->next;
-            p->next = NULL;
+            p = parameter_list_pop(headp);

             parameter_delete(&p);
         } else {
             headp = &(*headp)->next;
             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
 /* 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;
 
 {
     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);
             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;
             l += vl;
 
             q = par->next;


@@ -192,7 +186,7 @@ rfc2231_join_continuations(PARAMETER **head, rfc2231_param *par)
 
         if (value) {
             if (encoded)
 
         if (value) {
             if (encoded)

-                mutt_convert_string (&value, charset, Charset, M_ICONV_HOOK_FROM);
+                mutt_convert_string (&value, charset, MCharset.charset, M_ICONV_HOOK_FROM);

             *head = parameter_new();
             (*head)->attribute = m_strdup(attribute);
             (*head)->value = value;
             *head = parameter_new();
             (*head)->attribute = m_strdup(attribute);
             (*head)->value = value;


@@ -206,11 +200,11 @@ rfc2231_join_continuations(PARAMETER **head, rfc2231_param *par)
 /****************************************************************************/
 
 /* XXX: MC: not read */
 /****************************************************************************/
 
 /* 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;
 
     rfc2231_param *conthead = NULL;
     rfc2231_param *conttmp;


@@ -239,11 +233,11 @@ void rfc2231_decode_parameters (PARAMETER ** headp)
              * Internet Gateways.  So we actually decode it.
              */
 
              * 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(MCharset.assumed_charset, -1) == MIME_US_ASCII)
+                    mutt_convert_nonmime_string(&p->value);

             }
 
             *last = p;
             }
 
             *last = p;


@@ -255,7 +249,7 @@ void rfc2231_decode_parameters (PARAMETER ** headp)
 
             s = rfc2231_get_charset (p->value, charset, sizeof (charset));
             rfc2231_decode_one (p->value, s);
 
             s = rfc2231_get_charset (p->value, charset, sizeof (charset));
             rfc2231_decode_one (p->value, s);

-            mutt_convert_string (&p->value, charset, Charset, M_ICONV_HOOK_FROM);
+            mutt_convert_string (&p->value, charset, MCharset.charset, M_ICONV_HOOK_FROM);

 
             *last = p;
             last = &p->next;
 
             *last = p;
             last = &p->next;


@@ -319,13 +313,13 @@ int rfc2231_encode_string(char **s)
             return 0;
     }
 
             return 0;
     }
 

-    if (Charset && SendCharset) {
-        charset = mutt_choose_charset(Charset, SendCharset,
+    if (MCharset.charset && MCharset.send_charset) {
+        charset = mutt_choose_charset(MCharset.charset, MCharset.send_charset,

                                       *s, m_strlen(*s), &d, &dlen);
     }
 
     if (!charset) {
                                       *s, m_strlen(*s), &d, &dlen);
     }
 
     if (!charset) {

-        charset = m_strdup(Charset ? Charset : "unknown-8bit");
+        charset = m_strdup(MCharset.charset ?: "unknown-8bit");

         d = *s;
         dlen = m_strlen(d);
     }
         d = *s;
         dlen = m_strlen(d);
     }