X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-mime%2Frfc822parse.c;h=269b43e7b2c8cb240a548b63e528d696500a69f3;hb=1d11b74b25b888b74409380d588c5fdf14f65f1e;hp=9c43c9d0406b29483d98753d22b70342f14e0fea;hpb=8e075eda08c6f099ec6988e16607fb4f6a10ba92;p=apps%2Fmadmutt.git diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c index 9c43c9d..269b43e 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); } } @@ -957,7 +957,7 @@ 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) + if (weed && mutt_matches_ignore(line, Ignore) && !mutt_matches_ignore(line, UnIgnore)) { break; } @@ -1147,9 +1147,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;