X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc822parse.c;h=fa0beaa0f216b033477ed9c25a400b441180ee38;hp=9c43c9d0406b29483d98753d22b70342f14e0fea;hb=58e0ddff3bd5e1b9455e8c3ebb1f4b9e7dd71920;hpb=8e075eda08c6f099ec6988e16607fb4f6a10ba92

diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index 9c43c9d..fa0beaa 100644
--- a/lib-mime/rfc822parse.c
+++ b/lib-mime/rfc822parse.c
@@ -116,8 +116,8 @@ string_list_t *mutt_parse_references(char *s, int in_reply_to)
                 o = NULL;
             } else {
                 new = p_new(char, n + m + 1);
-                strcpy(new, o);
-                strcpy(new + n, s);
+                m_strcpy(new, n + m + 1, o);
+                m_strcpy(new + n, m + 1, s);
             }
         }
 
@@ -300,7 +300,7 @@ void mutt_parse_content_type(char *s, BODY *ct)
          * field, so we can attempt to convert the type to BODY here.
          */
         switch (ct->type) {
-            char buffer[SHORT_STRING];
+            char buffer[STRING];
 
           case TYPETEXT:
             ct->subtype = m_strdup("plain");
@@ -331,7 +331,7 @@ void mutt_parse_content_type(char *s, BODY *ct)
         pc = parameter_getval(ct->parameter, "charset");
         if (!pc) {
             parameter_setval(&ct->parameter, "charset",
-                             charset_getfirst(AssumedCharset));
+                             charset_getfirst(MCharset.assumed_charset));
         }
     }
 }
@@ -438,7 +438,7 @@ void mutt_parse_part(FILE *fp, BODY *b)
         if (b->subtype) {
             fseeko(fp, b->offset, SEEK_SET);
 
-            if (mutt_is_message_type(b->type, b->subtype)) {
+            if (mutt_is_message_type(b)) {
                 b->parts = mutt_parse_messageRFC822(fp, b);
             } else
             if (mime_which_token(b->subtype, -1) == MIME_EXTERNAL_BODY) {
@@ -608,7 +608,7 @@ uncomment_timezone(char *buf, size_t buflen, const char *tz)
 time_t mutt_parse_date(const char *s, HEADER *h)
 {
     int zhours = 0, zminutes = 0, zoccident = 0;
-    char scratch[SHORT_STRING];
+    char scratch[STRING];
     struct tm tm;
     int count = 0;
     char *p;
@@ -625,7 +625,7 @@ time_t mutt_parse_date(const char *s, HEADER *h)
     p_clear(&tm, 1);
 
     while ((p = strtok (p, " \t")) != NULL) {
-        char tzstr[SHORT_STRING];
+        char tzstr[STRING];
         const char *ptz;
 
         switch (count) {
@@ -957,8 +957,8 @@ string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, cha
         /* restore the original line */
         line[m_strlen(line)] = ':';
 
-        if (weed && option(OPTWEED) && mutt_matches_ignore(line, Ignore)
-        && !mutt_matches_ignore(line, UnIgnore)) {
+        if (weed && string_list_contains(Ignore, line, "*")
+        && !string_list_contains(UnIgnore, line, "*")) {
             break;
         }
 
@@ -1034,15 +1034,12 @@ mutt_read_rfc822_header(FILE *f, HEADER *hdr, short user_hdrs, short weed)
         {
             /* if spam tag already exists, figure out how to amend it */
             if (e->spam && *buf) {
-                if (SpamSep) {
-                    /* If SpamSep defined, append with separator */
-                    mutt_buffer_addstr(e->spam, SpamSep);
-                    mutt_buffer_addstr(e->spam, buf);
+                if (Mime.spam_separator) {
+                    mutt_buffer_addstr(e->spam, Mime.spam_separator);
                 } else {
-                    /* else overwrite */
                     mutt_buffer_reset(e->spam);
-                    mutt_buffer_addstr(e->spam, buf);
                 }
+                mutt_buffer_addstr(e->spam, buf);
             }
 
             if (!e->spam) {
@@ -1147,9 +1144,6 @@ static int count_body_parts (BODY *body, int flags)
 
 int mutt_count_body_parts(HEADER *hdr, int flags)
 {
-    if (!option(OPTCOUNTATTACH))
-        return 0;
-
     if (hdr->attach_valid && !(flags & M_PARTS_RECOUNT))
         return hdr->attach_total;