projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
post ? -post : 0
[apps/madmutt.git]
/
lib-mime
/
rfc822parse.c
diff --git
a/lib-mime/rfc822parse.c
b/lib-mime/rfc822parse.c
index
9c43c9d
..
269b43e
100644
(file)
--- 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);
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)] = ':';
/* 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;
}
&& !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)
{
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;
if (hdr->attach_valid && !(flags & M_PARTS_RECOUNT))
return hdr->attach_total;