X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-mime%2Frfc822parse.c;h=77cbe47bc306daa50fdb0051f1d679d2956bcee9;hb=23e6291cb5d5b4cd2008403d8b628007fd75ff23;hp=732a046ce2277bed6ae63166ddc2289de09500a3;hpb=05a3bbbe420e4afc76e0eea24ce32f859405dc4a;p=apps%2Fmadmutt.git

diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index 732a046..77cbe47 100644
--- a/lib-mime/rfc822parse.c
+++ b/lib-mime/rfc822parse.c
@@ -38,12 +38,11 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/buffer.h>
 #include <lib-lib/date.h>
-#include <lib-lib/debug.h>
+#include <lib-lib/url.h>
 
 #include "recvattach.h"
-#include "url.h"
-
 
+#include "charset.h"
 #include "mime.h"
 
 /* Reads an arbitrarily long header field, and looks ahead for continuation
@@ -100,9 +99,9 @@ ssize_t mutt_read_rfc822_line(FILE *f, char **line, ssize_t *n)
 }
 
 /* TODO: Make that a string list somehow */
-LIST *mutt_parse_references(char *s, int in_reply_to)
+string_list_t *mutt_parse_references(char *s, int in_reply_to)
 {
-    LIST *lst = NULL;
+    string_list_t *lst = NULL;
     int n = 0;
     char *o = NULL;
 
@@ -143,14 +142,14 @@ LIST *mutt_parse_references(char *s, int in_reply_to)
          */
         if (new) {
             char *at = strchr(new, '@');
-            LIST *tmp;
+            string_list_t *tmp;
 
             if (!at || strchr(at + 1, '@') || (in_reply_to && at - new <= 8)) {
                 p_delete(&new);
                 continue;
             }
 
-            tmp = p_new(LIST, 1);
+            tmp = p_new(string_list_t, 1);
             tmp->data = new;
             tmp->next = lst;
             lst = tmp;
@@ -282,7 +281,7 @@ void mutt_parse_content_type(char *s, BODY *ct)
     char *subtype;
 
     p_delete(&ct->subtype);
-    parameter_delete(&ct->parameter);
+    parameter_list_wipe(&ct->parameter);
 
     /* First extract any existing parameters */
     if ((pc = strchr(s, ';')) != NULL) {
@@ -373,7 +372,7 @@ static void parse_content_disposition(char *s, BODY *ct)
         if ((s = mutt_get_parameter ("name", parms)))
             ct->form_name = m_strdup(s);
 
-        parameter_delete(&parms);
+        parameter_list_wipe(&parms);
     }
 }
 
@@ -403,7 +402,6 @@ BODY *mutt_read_mime_header(FILE *fp, int digest)
             if (!*p)
                 continue;
         } else {
-            debug_print (1, ("bogus MIME header: %s\n", line));
             break;
         }
 
@@ -782,7 +780,6 @@ time_t mutt_parse_date(const char *s, HEADER *h)
     }
 
     if (count < 4) {  /* don't check for missing timezone */
-        debug_print (1, ("error parsing date format, using received time\n"));
         return -1;
     }
 
@@ -795,8 +792,8 @@ time_t mutt_parse_date(const char *s, HEADER *h)
     return mutt_mktime(&tm, 0) + (zoccident ? 1 : -1) * (zhours * 3600 + zminutes * 60);
 }
 
-LIST **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p,
-                              short weed, short do_2047, LIST **user_hdrs)
+string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p,
+                              short weed, short do_2047, string_list_t **user_hdrs)
 {
     switch (mime_which_token(line, -1)) {
       case MIME_APPARENTLY_FROM:
@@ -877,7 +874,7 @@ LIST **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p,
         break;
 
       case MIME_IN_REPLY_TO:
-        mutt_free_list(&e->in_reply_to);
+        string_list_wipe(&e->in_reply_to);
         e->in_reply_to = mutt_parse_references(p, 1);
         break;
 
@@ -914,7 +911,7 @@ LIST **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p,
         break;
 
       case MIME_MAIL_REPLY_TO:
-        address_delete (&e->reply_to);
+        address_list_wipe(&e->reply_to);
         e->reply_to = rfc822_parse_adrlist(e->reply_to, p);
         break;
 
@@ -957,7 +954,7 @@ LIST **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p,
         break;
 
       case MIME_REFERENCES:
-        mutt_free_list(&e->references);
+        string_list_wipe(&e->references);
         e->references = mutt_parse_references(p, 0);
         break;
 
@@ -1058,7 +1055,7 @@ LIST **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p,
             break;
         }
 
-        *user_hdrs = mutt_new_list();
+        *user_hdrs = string_item_new();
         (*user_hdrs)->data = m_strdup(line);
         if (do_2047)
             rfc2047_decode(&(*user_hdrs)->data);
@@ -1090,7 +1087,7 @@ ENVELOPE *
 mutt_read_rfc822_header(FILE *f, HEADER *hdr, short user_hdrs, short weed)
 {
     ENVELOPE *e = envelope_new();
-    LIST **last = user_hdrs ? &e->userhdrs : NULL;
+    string_list_t **last = user_hdrs ? &e->userhdrs : NULL;
 
     char *line = p_new(char, LONG_STRING);
     ssize_t linelen = LONG_STRING;
@@ -1176,8 +1173,6 @@ mutt_read_rfc822_header(FILE *f, HEADER *hdr, short user_hdrs, short weed)
         rfc2047_decode_envelope(e);
         /* check for missing or invalid date */
         if (hdr->date_sent <= 0) {
-            debug_print(1, ("no date found, using received "
-                            "time from msg separator\n"));
             hdr->date_sent = hdr->received;
         }
     }
@@ -1186,9 +1181,9 @@ mutt_read_rfc822_header(FILE *f, HEADER *hdr, short user_hdrs, short weed)
 }
 
 /* Compares mime types to the ok and except lists */
-static int count_body_parts_check(LIST **checklist, BODY *b)
+static int count_body_parts_check(string_list_t **checklist, BODY *b)
 {
-    LIST *type;
+    string_list_t *type;
 
     for (type = *checklist; type; type = type->next) {
         ATTACH_MATCH *a = (ATTACH_MATCH *)type->data;