projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
code simplifications.
[apps/madmutt.git]
/
lib-mime
/
rfc822parse.c
diff --git
a/lib-mime/rfc822parse.c
b/lib-mime/rfc822parse.c
index
3897114
..
fa0beaa
100644
(file)
--- a/
lib-mime/rfc822parse.c
+++ b/
lib-mime/rfc822parse.c
@@
-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));
}
}
}
}
}
}
@@
-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 &&
mutt_matches_ignore(line, Ignore
)
- && !
mutt_matches_ignore(line, UnIgnore
)) {
+ if (weed &&
string_list_contains(Ignore, line, "*"
)
+ && !
string_list_contains(UnIgnore, line, "*"
)) {
break;
}
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 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 {
- /* else overwrite */
mutt_buffer_reset(e->spam);
mutt_buffer_reset(e->spam);
- mutt_buffer_addstr(e->spam, buf);
}
}
+ mutt_buffer_addstr(e->spam, buf);
}
if (!e->spam) {
}
if (!e->spam) {