X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc822parse.c;h=a1b4d54324a35b7984b9f8fb32a83d92538e4c85;hp=65b03b4f8dfcc74013fc95809e7fb065e943d607;hb=819c071fa7efc8dffb4dd92f36f0111227ff692f;hpb=1ee89902de184a640c171ae3285bff6882a791bd diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c index 65b03b4..a1b4d54 100644 --- a/lib-mime/rfc822parse.c +++ b/lib-mime/rfc822parse.c @@ -29,7 +29,6 @@ #include #include "recvattach.h" - #include "charset.h" #include "mime.h" @@ -117,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); } } @@ -228,12 +227,10 @@ static parameter_t *parse_parameters(const char *s) s++; for (i = 0; *s && i < ssizeof(buffer) - 1; i++, s++) { - if (!option(OPTSTRICTMIME)) { - /* As iso-2022-* has a characer of '"' with non-ascii state, - * ignore it. */ - if (*s == 0x1b && i < ssizeof(buffer) - 2) { - state_ascii = s[1] == '(' && (s[2] == 'B' || s[2] == 'J'); - } + /* As iso-2022-* has a characer of '"' with non-ascii state, + * ignore it. */ + if (*s == 0x1b && i < ssizeof(buffer) - 2) { + state_ascii = s[1] == '(' && (s[2] == 'B' || s[2] == 'J'); } if (state_ascii && *s == '"') break; @@ -303,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"); @@ -334,9 +331,7 @@ void mutt_parse_content_type(char *s, BODY *ct) pc = parameter_getval(ct->parameter, "charset"); if (!pc) { parameter_setval(&ct->parameter, "charset", - option(OPTSTRICTMIME) - ? "us-ascii" - : charset_getfirst(AssumedCharset)); + charset_getfirst(mod_cset.assumed_charset)); } } } @@ -443,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) { @@ -586,23 +581,6 @@ mutt_parse_multipart(FILE *fp, const char *bound, off_t end_off, int digest) return (head); } -static const char * -uncomment_timezone(char *buf, size_t buflen, const char *tz) -{ - char *p; - - if (*tz != '(') - return tz; /* no need to do anything */ - - tz = vskipspaces(tz + 1); - p = strpbrk(tz, " )"); - if (!p) - return tz; - - m_strncpy(buf, buflen, tz, p - tz); - return buf; -} - /* parses a date string in RFC822 format: * * Date: [ weekday , ] day-of-month month year hour:minute:second timezone @@ -612,96 +590,24 @@ 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]; struct tm tm; - int count = 0; - char *p; - - /* Don't modify our argument. Fixed-size buffer is ok here since - the date format imposes a natural limit. */ - - m_strcpy(scratch, sizeof(scratch), s); - - /* kill the day of the week, if it exists. */ - p = strchr(scratch, ','); - p = vskipspaces(p ? p + 1 : scratch); + const char *loc; + time_t tz; + loc = setlocale(LC_ALL, "C"); p_clear(&tm, 1); + if (strptime(s, "%a, %d %b %Y %H:%M:%S %z", &tm)) + goto ok; + p_clear(&tm, 1); + if (strptime(s, "%a, %d %b %Y %H:%M %z", &tm)) + goto ok; + setlocale(LC_ALL, ""); + return 0; - while ((p = strtok (p, " \t")) != NULL) { - char tzstr[SHORT_STRING]; - const char *ptz; - - switch (count) { - case 0: /* day of the month */ - if (!isdigit((unsigned char)*p)) - return -1; - tm.tm_mday = atoi(p); - if (tm.tm_mday > 31) - return -1; - break; - - case 1: /* month of the year */ - tm.tm_mon = mutt_check_month(p); - if (tm.tm_mon < 0) - return -1; - break; - - case 2: /* year */ - tm.tm_year = atoi(p); - if (tm.tm_year < 50) - tm.tm_year += 100; - else if (tm.tm_year >= 1900) - tm.tm_year -= 1900; - break; - - case 3: /* time of day */ - tm.tm_hour = strtol(p, &p, 10); - if (*p++ != ':') - return -1; - tm.tm_min = strtol(p, &p, 10); - if (*p++ == ':') { - tm.tm_sec = strtol(p, &p, 10); - } else { - tm.tm_sec = 0; - } - break; - - case 4: /* timezone */ - /* sometimes we see things like (MST) or (-0700) so attempt to - * compensate by uncommenting the string if non-RFC822 compliant - */ - ptz = uncomment_timezone(tzstr, sizeof(tzstr), p); - - if (*ptz == '+' || *ptz == '-') { - if (isdigit((unsigned char)ptz[1]) - && isdigit((unsigned char)ptz[2]) - && isdigit((unsigned char)ptz[3]) - && isdigit((unsigned char)ptz[4])) - { - zoccident = ptz[0] == '-'; - zhours = (ptz[1] - '0') * 10 + (ptz[2] - '0'); - zminutes = (ptz[3] - '0') * 10 + (ptz[4] - '0'); - } - } - break; - } - count++; - p = NULL; - } - - if (count < 4) { /* don't check for missing timezone */ - return -1; - } - - if (h) { - h->zhours = zhours; - h->zminutes = zminutes; - h->zoccident = zoccident; - } - - return mutt_mktime(&tm, 0) + (zoccident ? 1 : -1) * (zhours * 3600 + zminutes * 60); + ok: + setlocale(LC_ALL, ""); + tz = tm.tm_gmtoff; + return timegm(&tm) - tz; } string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p, @@ -764,15 +670,6 @@ string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, cha hdr->expired = 1; break; -#ifdef USE_NNTP - case MIME_FOLLOWUP_TO: - if (!e->followup_to) { - m_strrtrim(p); - e->followup_to = m_strdup(skipspaces(p)); - } - break; -#endif - case MIME_FROM: e->from = rfc822_parse_adrlist(e->from, p); /* don't leave from info NULL if there's an invalid address (or @@ -800,7 +697,7 @@ string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, cha case MIME_LIST_POST: /* RFC 2369. FIXME: We should ignore whitespace, but don't. */ - if (strncmp(p, "NO", 2)) { + if (m_strncmp(p, "NO", 2)) { char *beg, *end; for (beg = strchr (p, '<'); beg; beg = strchr (end, ',')) { @@ -844,14 +741,6 @@ string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, cha hdr->mime = 1; break; -#ifdef USE_NNTP - case MIME_NEWSGROUPS: - p_delete(&e->newsgroups); - m_strrtrim(p); - e->newsgroups = m_strdup(skipspaces(p)); - break; -#endif - case MIME_ORGANIZATION: if (!e->organization && mime_which_token(p, -1) == MIME_UNKNOWN) e->organization = m_strdup(p); @@ -916,24 +805,10 @@ string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, cha e->to = rfc822_parse_adrlist(e->to, p); break; -#ifdef USE_NNTP - case MIME_X_COMMENT_TO: - if (!e->x_comment_to) - e->x_comment_to = m_strdup(p); - break; -#endif - case MIME_X_LABEL: e->x_label = m_strdup(p); break; -#ifdef USE_NNTP - case MIME_XREF: - if (!e->xref) - e->xref = m_strdup(p); - break; -#endif - case MIME_X_STATUS: if (hdr) { while (*p) { @@ -962,8 +837,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; } @@ -1026,46 +901,29 @@ mutt_read_rfc822_header(FILE *f, HEADER *hdr, short user_hdrs, short weed) p = strpbrk(line, ": \t"); if (!p || *p != ':') { - char return_path[LONG_STRING]; - time_t t; - /* some bogus MTAs will quote the original "From " line */ - if (!m_strncmp(">From ", line, 6)) + if (!m_strncmp(">From ", line, 6) || !m_strncmp("From ", line, 5)) continue; /* just ignore */ - if (is_from(line, return_path, sizeof(return_path), &t)) { - /* MH somtimes has the From_ line in the middle of the header! */ - if (hdr && !hdr->received) - hdr->received = t - mutt_local_tz(t); - continue; - } - fseeko(f, loc, 0); break; /* end of header */ } - if (mutt_match_spam_list(line, SpamList, buf, sizeof(buf))) { - if (!rx_list_match(NoSpamList, line)) { - /* 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); - } else { - /* else overwrite */ - mutt_buffer_reset(e->spam); - mutt_buffer_addstr(e->spam, buf); - } - } - else if (!e->spam && *buf) { - /* spam tag is new, and match expr is non-empty; copy */ - e->spam = mutt_buffer_from(NULL, buf); - } - else if (!e->spam) { - /* match expr is empty; plug in null string if no existing tag */ - e->spam = mutt_buffer_from(NULL, ""); + if (rx_list_match2(SpamList, line, buf, sizeof(buf)) + && !rx_list_match(NoSpamList, line)) + { + /* if spam tag already exists, figure out how to amend it */ + if (e->spam && *buf) { + if (mod_mime.spam_separator) { + mutt_buffer_addstr(e->spam, mod_mime.spam_separator); + } else { + mutt_buffer_reset(e->spam); } + mutt_buffer_addstr(e->spam, buf); + } + + if (!e->spam) { + e->spam = mutt_buffer_from(NULL, buf); } } @@ -1166,9 +1024,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; @@ -1181,3 +1036,72 @@ int mutt_count_body_parts(HEADER *hdr, int flags) hdr->attach_valid = 1; return hdr->attach_total; } + +/* + * A valid message separator looks like: + * + * From [ ]