projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small touchups
[apps/madmutt.git]
/
lib-mime
/
rfc822parse.c
diff --git
a/lib-mime/rfc822parse.c
b/lib-mime/rfc822parse.c
index
9c43c9d
..
3e77c57
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);
}
}
}
}
@@
-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) {
* field, so we can attempt to convert the type to BODY here.
*/
switch (ct->type) {
- char buffer[S
HORT_S
TRING];
+ char buffer[STRING];
case TYPETEXT:
ct->subtype = m_strdup("plain");
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",
pc = parameter_getval(ct->parameter, "charset");
if (!pc) {
parameter_setval(&ct->parameter, "charset",
- charset_getfirst(
AssumedC
harset));
+ charset_getfirst(
MCharset.assumed_c
harset));
}
}
}
}
}
}
@@
-438,7
+438,7
@@
void mutt_parse_part(FILE *fp, BODY *b)
if (b->subtype) {
fseeko(fp, b->offset, SEEK_SET);
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) {
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;
time_t mutt_parse_date(const char *s, HEADER *h)
{
int zhours = 0, zminutes = 0, zoccident = 0;
- char scratch[S
HORT_S
TRING];
+ char scratch[STRING];
struct tm tm;
int count = 0;
char *p;
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) {
p_clear(&tm, 1);
while ((p = strtok (p, " \t")) != NULL) {
- char tzstr[S
HORT_S
TRING];
+ char tzstr[STRING];
const char *ptz;
switch (count) {
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)] = ':';
/* 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;
}
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;