X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc822parse.c;h=33012fd72052097ce0a02cda0509676c8625642f;hp=6032132956c20da5031ee21272ce75b23e492304;hb=774b53097f8c8b62c5101bce8f313d339387a438;hpb=e25b0de8c4e7d6aeeb467f8ea1ad8dd6b2a9470e diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c index 6032132..33012fd 100644 --- a/lib-mime/rfc822parse.c +++ b/lib-mime/rfc822parse.c @@ -38,15 +38,11 @@ #include #include #include - -#include +#include #include "recvattach.h" -#include "mx.h" -#include "url.h" - -#include "lib/debug.h" +#include "charset.h" #include "mime.h" /* Reads an arbitrarily long header field, and looks ahead for continuation @@ -103,9 +99,9 @@ ssize_t mutt_read_rfc822_line(FILE *f, char **line, ssize_t *n) } /* TODO: Make that a string list somehow */ -LIST *mutt_parse_references(char *s, int in_reply_to) +string_list_t *mutt_parse_references(char *s, int in_reply_to) { - LIST *lst = NULL; + string_list_t *lst = NULL; int n = 0; char *o = NULL; @@ -146,14 +142,14 @@ LIST *mutt_parse_references(char *s, int in_reply_to) */ if (new) { char *at = strchr(new, '@'); - LIST *tmp; + string_list_t *tmp; if (!at || strchr(at + 1, '@') || (in_reply_to && at - new <= 8)) { p_delete(&new); continue; } - tmp = p_new(LIST, 1); + tmp = p_new(string_list_t, 1); tmp->data = new; tmp->next = lst; lst = tmp; @@ -165,50 +161,54 @@ LIST *mutt_parse_references(char *s, int in_reply_to) int mutt_check_encoding(const char *s) { -#define COMPARE(tok, value) \ - if (!ascii_strncasecmp(tok, s, sizeof(tok) - 1)) { \ - return value; \ + int tok = mime_which_token(s, -1); + switch (tok) { + case MIME_7BIT: + return ENC7BIT; + case MIME_8BIT: + return ENC8BIT; + case MIME_BINARY: + return ENCBINARY; + case MIME_QUOTED_PRINTABLE: + return ENCQUOTEDPRINTABLE; + case MIME_BASE64: + return ENCBASE64; + case MIME_X_UUENCODE: + return ENCUUENCODED; + default: + return ENCOTHER; } - COMPARE("7bit", ENC7BIT); - COMPARE("8bit", ENC8BIT); - COMPARE("binary", ENCBINARY); - COMPARE("quoted-printable", ENCQUOTEDPRINTABLE); - COMPARE("base64", ENCBASE64); - COMPARE("x-uuencode", ENCUUENCODED); -#undef COMPARE - - return ENCOTHER; } int mutt_check_mime_type(const char *s) { -#define COMPARE(tok, value) \ - if (!ascii_strncasecmp(tok, s, sizeof(tok) - 1)) { \ - return value; \ + int tok; + + if (!m_strcmp(s, "*") || !m_strcmp(s, ".*")) + return TYPEANY; + + tok = mime_which_token(s, -1); + switch (tok) { + case MIME_TEXT: return TYPETEXT; + case MIME_MULTIPART: return TYPEMULTIPART; + case MIME_APPLICATION: return TYPEAPPLICATION; + case MIME_MESSAGE: return TYPEMESSAGE; + case MIME_IMAGE: return TYPEIMAGE; + case MIME_AUDIO: return TYPEAUDIO; + case MIME_VIDEO: return TYPEVIDEO; + case MIME_MODEL: return TYPEMODEL; + default: return TYPEOTHER; } - COMPARE("text", TYPETEXT); - COMPARE("multipart", TYPEMULTIPART); - COMPARE("application", TYPEAPPLICATION); - COMPARE("message", TYPEMESSAGE); - COMPARE("image", TYPEIMAGE); - COMPARE("audio", TYPEAUDIO); - COMPARE("video", TYPEVIDEO); - COMPARE("model", TYPEMODEL); - COMPARE("*", TYPEANY); - COMPARE(".*", TYPEANY); -#undef COMPARE - - return TYPEOTHER; } -static PARAMETER *parse_parameters(const char *s) +static parameter_t *parse_parameters(const char *s) { - PARAMETER *res = NULL; - PARAMETER **list = &res; + parameter_t *res = NULL; + parameter_t **list = &res; while (*s) { const char *p; - PARAMETER *new; + parameter_t *new; int i; s = skipspaces(s); @@ -281,7 +281,7 @@ void mutt_parse_content_type(char *s, BODY *ct) char *subtype; p_delete(&ct->subtype); - parameter_delete(&ct->parameter); + parameter_list_wipe(&ct->parameter); /* First extract any existing parameters */ if ((pc = strchr(s, ';')) != NULL) { @@ -291,7 +291,7 @@ void mutt_parse_content_type(char *s, BODY *ct) /* Some pre-RFC1521 gateways still use the "name=filename" convention, * but if a filename has already been set in the content-disposition, * let that take precedence, and don't set it here */ - pc = mutt_get_parameter("name", ct->parameter); + pc = parameter_getval(ct->parameter, "name"); if (pc && !ct->filename) ct->filename = m_strdup(pc); } @@ -343,17 +343,17 @@ void mutt_parse_content_type(char *s, BODY *ct) /* Default character set for text types. */ if (ct->type == TYPETEXT) { - pc = mutt_get_parameter("charset", ct->parameter); + pc = parameter_getval(ct->parameter, "charset"); if (!pc) { - mutt_set_parameter("charset", - option(OPTSTRICTMIME) ? "us-ascii" : - mutt_get_first_charset(AssumedCharset), - &ct->parameter); + parameter_setval(&ct->parameter, "charset", + option(OPTSTRICTMIME) + ? "us-ascii" + : charset_getfirst(AssumedCharset)); } } } -static void parse_content_disposition(char *s, BODY *ct) +static void parse_content_disposition(const char *s, BODY *ct) { if (!ascii_strncasecmp(s, "inline", 6)) { ct->disposition = DISPINLINE; @@ -365,14 +365,14 @@ static void parse_content_disposition(char *s, BODY *ct) /* Check to see if a default filename was given */ if ((s = strchr (s, ';'))) { - PARAMETER *parms = parse_parameters(vskipspaces(s)); + parameter_t *parms = parse_parameters(vskipspaces(s)); - if ((s = mutt_get_parameter("filename", parms))) + if ((s = parameter_getval(parms, "filename"))) m_strreplace(&ct->filename, s); - if ((s = mutt_get_parameter ("name", parms))) + if ((s = parameter_getval(parms, "name"))) ct->form_name = m_strdup(s); - parameter_delete(&parms); + parameter_list_wipe(&parms); } } @@ -384,7 +384,7 @@ static void parse_content_disposition(char *s, BODY *ct) */ BODY *mutt_read_mime_header(FILE *fp, int digest) { - BODY *body = mutt_new_body (); + BODY *body = body_new(); char *line = p_new(char, LONG_STRING); ssize_t linelen = LONG_STRING; char *p; @@ -402,21 +402,28 @@ BODY *mutt_read_mime_header(FILE *fp, int digest) if (!*p) continue; } else { - debug_print (1, ("bogus MIME header: %s\n", line)); break; } - if (!ascii_strncasecmp(line, "content-", 8)) { - if (!ascii_strcasecmp("type", line + 8)) - mutt_parse_content_type (p, body); - else if (!ascii_strcasecmp ("transfer-encoding", line + 8)) - body->encoding = mutt_check_encoding (p); - else if (!ascii_strcasecmp ("disposition", line + 8)) - parse_content_disposition(p, body); - else if (!ascii_strcasecmp ("description", line + 8)) { - m_strreplace(&body->description, p); - rfc2047_decode(&body->description); - } + switch (mime_which_token(line, -1)) { + case MIME_CONTENT_TYPE: + mutt_parse_content_type (p, body); + break; + + case MIME_CONTENT_TRANSFER_ENCODING: + body->encoding = mutt_check_encoding (p); + break; + + case MIME_CONTENT_DISPOSITION: + parse_content_disposition(p, body); + break; + + case MIME_CONTENT_DESCRIPTION: + m_strreplace(&body->description, p); + rfc2047_decode(&body->description); + break; + + default: break; } } @@ -438,10 +445,10 @@ void mutt_parse_part(FILE *fp, BODY *b) switch (b->type) { case TYPEMULTIPART: - bound = mutt_get_parameter("boundary", b->parameter); + bound = parameter_getval(b->parameter, "boundary"); fseeko(fp, b->offset, SEEK_SET); b->parts = mutt_parse_multipart(fp, bound, b->offset + b->length, - !ascii_strcasecmp("digest", b->subtype)); + mime_which_token(b->subtype, -1) == MIME_DIGEST); break; case TYPEMESSAGE: @@ -451,7 +458,7 @@ void mutt_parse_part(FILE *fp, BODY *b) if (mutt_is_message_type(b->type, b->subtype)) { b->parts = mutt_parse_messageRFC822(fp, b); } else - if (!ascii_strcasecmp(b->subtype, "external-body") == 0) { + if (mime_which_token(b->subtype, -1) == MIME_EXTERNAL_BODY) { b->parts = mutt_read_mime_header(fp, 0); } else { return; @@ -566,7 +573,7 @@ mutt_parse_multipart(FILE *fp, const char *bound, off_t end_off, int digest) */ if (new->offset > end_off) { - mutt_free_body(&new); + body_list_wipe(&new); break; } @@ -608,62 +615,6 @@ uncomment_timezone(char *buf, size_t buflen, const char *tz) return buf; } -static struct tz_t { - char tzname[5]; - unsigned char zhours; - unsigned char zminutes; - unsigned char zoccident; /* west of UTC? */ -} TimeZones[] = { - {"aat", 1, 0, 1}, /* Atlantic Africa Time */ - {"adt", 4, 0, 0}, /* Arabia DST */ - {"ast", 3, 0, 0}, /* Arabia */ - /*{ "ast", 4, 0, 1 }, *//* Atlantic */ - {"bst", 1, 0, 0}, /* British DST */ - {"cat", 1, 0, 0}, /* Central Africa */ - {"cdt", 5, 0, 1}, - {"cest", 2, 0, 0}, /* Central Europe DST */ - {"cet", 1, 0, 0}, /* Central Europe */ - {"cst", 6, 0, 1}, - /*{ "cst", 8, 0, 0 }, *//* China */ - /*{ "cst", 9, 30, 0 }, *//* Australian Central Standard Time */ - {"eat", 3, 0, 0}, /* East Africa */ - {"edt", 4, 0, 1}, - {"eest", 3, 0, 0}, /* Eastern Europe DST */ - {"eet", 2, 0, 0}, /* Eastern Europe */ - {"egst", 0, 0, 0}, /* Eastern Greenland DST */ - {"egt", 1, 0, 1}, /* Eastern Greenland */ - {"est", 5, 0, 1}, - {"gmt", 0, 0, 0}, - {"gst", 4, 0, 0}, /* Presian Gulf */ - {"hkt", 8, 0, 0}, /* Hong Kong */ - {"ict", 7, 0, 0}, /* Indochina */ - {"idt", 3, 0, 0}, /* Israel DST */ - {"ist", 2, 0, 0}, /* Israel */ - /*{ "ist", 5, 30, 0 }, *//* India */ - {"jst", 9, 0, 0}, /* Japan */ - {"kst", 9, 0, 0}, /* Korea */ - {"mdt", 6, 0, 1}, - {"met", 1, 0, 0}, /* this is now officially CET */ - {"msd", 4, 0, 0}, /* Moscow DST */ - {"msk", 3, 0, 0}, /* Moscow */ - {"mst", 7, 0, 1}, - {"nzdt", 13, 0, 0}, /* New Zealand DST */ - {"nzst", 12, 0, 0}, /* New Zealand */ - {"pdt", 7, 0, 1}, - {"pst", 8, 0, 1}, - {"sat", 2, 0, 0}, /* South Africa */ - {"smt", 4, 0, 0}, /* Seychelles */ - {"sst", 11, 0, 1}, /* Samoa */ - /*{ "sst", 8, 0, 0 }, *//* Singapore */ - {"utc", 0, 0, 0}, - {"wat", 0, 0, 0}, /* West Africa */ - {"west", 1, 0, 0}, /* Western Europe DST */ - {"wet", 0, 0, 0}, /* Western Europe */ - {"wgst", 2, 0, 1}, /* Western Greenland DST */ - {"wgt", 3, 0, 1}, /* Western Greenland */ - {"wst", 8, 0, 0}, /* Western Australia */ -}; - /* parses a date string in RFC822 format: * * Date: [ weekday , ] day-of-month month year hour:minute:second timezone @@ -673,14 +624,11 @@ static struct tz_t { */ time_t mutt_parse_date(const char *s, HEADER *h) { - int count = 0; - char *p; - struct tm tm; - int tz_offset = 0; int zhours = 0, zminutes = 0, zoccident = 0; - const char *ptz; - char tzstr[SHORT_STRING]; 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. */ @@ -694,6 +642,9 @@ time_t mutt_parse_date(const char *s, HEADER *h) p_clear(&tm, 1); 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)) @@ -745,31 +696,7 @@ time_t mutt_parse_date(const char *s, HEADER *h) zhours = (ptz[1] - '0') * 10 + (ptz[2] - '0'); zminutes = (ptz[3] - '0') * 10 + (ptz[4] - '0'); } - } else { - struct tz_t *tz; - - /* This is safe to do: A pointer to a struct equals a pointer to its - * first element*/ - tz = bsearch(ptz, TimeZones, countof(TimeZones), sizeof(TimeZones[0]), - (int (*)(const void *, const void *))ascii_strcasecmp); - - if (tz) { - zhours = tz->zhours; - zminutes = tz->zminutes; - zoccident = tz->zoccident; - } - - /* ad hoc support for the European MET (now officially CET) TZ */ - if (ascii_strcasecmp(p, "MET") == 0) { - if ((p = strtok (NULL, " \t")) && !ascii_strcasecmp(p, "DST")) { - zhours++; - } - } } - - tz_offset = zhours * 3600 + zminutes * 60; - if (!zoccident) - tz_offset = -tz_offset; break; } count++; @@ -777,7 +704,6 @@ time_t mutt_parse_date(const char *s, HEADER *h) } if (count < 4) { /* don't check for missing timezone */ - debug_print (1, ("error parsing date format, using received time\n")); return -1; } @@ -787,376 +713,282 @@ time_t mutt_parse_date(const char *s, HEADER *h) h->zoccident = zoccident; } - return mutt_mktime(&tm, 0) + tz_offset; + return mutt_mktime(&tm, 0) + (zoccident ? 1 : -1) * (zhours * 3600 + zminutes * 60); } -/*** XXX: MC READ MARK ***/ - -/* extract the first substring that looks like a message-id */ -static char *extract_message_id(const char *s) +string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p, + short weed, short do_2047, string_list_t **user_hdrs) { - const char *p; + switch (mime_which_token(line, -1)) { + case MIME_APPARENTLY_FROM: + e->from = rfc822_parse_adrlist (e->from, p); + break; - if ((s = strchr(s, '<')) == NULL || (p = strchr(s, '>')) == NULL) - return NULL; - return p_dupstr(s, (p - s) + 1); -} + case MIME_APPARENTLY_TO: + e->to = rfc822_parse_adrlist (e->to, p); + break; -void mutt_parse_mime_message (CONTEXT * ctx, HEADER * cur) -{ - MESSAGE *msg; - int flags = 0; + case MIME_BCC: + e->bcc = rfc822_parse_adrlist (e->bcc, p); + break; - do { - if (cur->content->type != TYPEMESSAGE - && cur->content->type != TYPEMULTIPART) - break; /* nothing to do */ + case MIME_CC: + e->cc = rfc822_parse_adrlist (e->cc, p); + break; - if (cur->content->parts) - break; /* The message was parsed earlier. */ + case MIME_CONTENT_DESCRIPTION: + if (hdr) { + m_strreplace(&hdr->content->description, p); + rfc2047_decode(&hdr->content->description); + } + break; - if ((msg = mx_open_message (ctx, cur->msgno))) { - mutt_parse_part (msg->fp, cur->content); + case MIME_CONTENT_DISPOSITION: + if (hdr) + parse_content_disposition(p, hdr->content); + break; - cur->security = crypt_query (cur->content); + case MIME_CONTENT_LENGTH: + if (hdr) { + if ((hdr->content->length = atoi(p)) < 0) + hdr->content->length = -1; + } + break; - mx_close_message (&msg); - } - } while (0); - mutt_count_body_parts (cur, flags | M_PARTS_RECOUNT); -} + case MIME_CONTENT_TRANSFER_ENCODING: + if (hdr) + hdr->content->encoding = mutt_check_encoding(p); + break; -int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p, - short user_hdrs, short weed, short do_2047, - LIST ** lastp) -{ - int matched = 0; - LIST *last = NULL; + case MIME_CONTENT_TYPE: + if (hdr) + mutt_parse_content_type (p, hdr->content); + break; - if (lastp) - last = *lastp; + case MIME_DATE: + m_strreplace(&e->date, p); + if (hdr) + hdr->date_sent = mutt_parse_date (p, hdr); + break; - switch (ascii_tolower (line[0])) { - case 'a': - if (ascii_strcasecmp (line + 1, "pparently-to") == 0) { - e->to = rfc822_parse_adrlist (e->to, p); - matched = 1; - } - else if (ascii_strcasecmp (line + 1, "pparently-from") == 0) { - e->from = rfc822_parse_adrlist (e->from, p); - matched = 1; - } - break; + case MIME_EXPIRES: + if (hdr && mutt_parse_date (p, NULL) < time (NULL)) + hdr->expired = 1; + break; - case 'b': - if (ascii_strcasecmp (line + 1, "cc") == 0) { - e->bcc = rfc822_parse_adrlist (e->bcc, p); - matched = 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 'c': - if (ascii_strcasecmp (line + 1, "c") == 0) { - e->cc = rfc822_parse_adrlist (e->cc, p); - matched = 1; - } - else if (ascii_strncasecmp (line + 1, "ontent-", 7) == 0) { - if (ascii_strcasecmp (line + 8, "type") == 0) { - if (hdr) - mutt_parse_content_type (p, hdr->content); - matched = 1; - } - else if (ascii_strcasecmp (line + 8, "transfer-encoding") == 0) { - if (hdr) - hdr->content->encoding = mutt_check_encoding (p); - matched = 1; - } - else if (ascii_strcasecmp (line + 8, "length") == 0) { - if (hdr) { - if ((hdr->content->length = atoi (p)) < 0) - hdr->content->length = -1; + case MIME_FROM: + e->from = rfc822_parse_adrlist(e->from, p); + /* don't leave from info NULL if there's an invalid address (or + * whatever) in From: field; mutt would just display it as empty + * and mark mail/(esp.) news article as your own. aaargh! this + * bothered me for _years_ */ + if (!e->from) { + e->from = address_new(); + e->from->personal = m_strdup(p); } - matched = 1; - } - else if (ascii_strcasecmp (line + 8, "description") == 0) { + break; + + case MIME_IN_REPLY_TO: + string_list_wipe(&e->in_reply_to); + e->in_reply_to = mutt_parse_references(p, 1); + break; + + case MIME_LINES: if (hdr) { - m_strreplace(&hdr->content->description, p); - rfc2047_decode (&hdr->content->description); + /* HACK - mutt has, for a very short time, produced negative + Lines header values. Ignore them. */ + hdr->lines = MAX(0, atoi(p)); } - matched = 1; - } - else if (ascii_strcasecmp (line + 8, "disposition") == 0) { + break; + + case MIME_LIST_POST: + /* RFC 2369. FIXME: We should ignore whitespace, but don't. */ + if (strncmp(p, "NO", 2)) { + char *beg, *end; + + for (beg = strchr (p, '<'); beg; beg = strchr (end, ',')) { + ++beg; + if (!(end = strchr (beg, '>'))) + break; + + /* Take the first mailto URL */ + if (url_check_scheme (beg) == U_MAILTO) { + p_delete(&e->list_post); + e->list_post = p_dupstr(beg, end - beg); + break; + } + } + } + break; + + case MIME_MAIL_FOLLOWUP_TO: + e->mail_followup_to = rfc822_parse_adrlist(e->mail_followup_to, p); + break; + + case MIME_MAIL_REPLY_TO: + address_list_wipe(&e->reply_to); + e->reply_to = rfc822_parse_adrlist(e->reply_to, p); + break; + + case MIME_MESSAGE_ID: + { + const char *beg, *end; + + /* We add a new "Message-ID:" when building a message */ + p_delete(&e->message_id); + + if ((beg = strchr(p, '<')) && (end = strchr(beg, '>'))) + e->message_id = p_dupstr(beg, (end - beg) + 1); + } + break; + + case MIME_MIME_VERSION: if (hdr) - parse_content_disposition (p, hdr->content); - matched = 1; - } - } - break; - - case 'd': - if (!ascii_strcasecmp ("ate", line + 1)) { - m_strreplace(&e->date, p); - if (hdr) - hdr->date_sent = mutt_parse_date (p, hdr); - matched = 1; - } - break; - - case 'e': - if (!ascii_strcasecmp ("xpires", line + 1) && - hdr && mutt_parse_date (p, NULL) < time (NULL)) - hdr->expired = 1; - break; - - case 'f': - if (!ascii_strcasecmp ("rom", line + 1)) { - e->from = rfc822_parse_adrlist (e->from, p); - /* don't leave from info NULL if there's an invalid address (or - * whatever) in From: field; mutt would just display it as empty - * and mark mail/(esp.) news article as your own. aaargh! this - * bothered me for _years_ */ - if (!e->from) { - e->from = address_new (); - e->from->personal = m_strdup(p); - } - matched = 1; - } + hdr->mime = 1; + break; + #ifdef USE_NNTP - else if (!m_strcasecmp(line + 1, "ollowup-to")) { - if (!e->followup_to) { + case MIME_NEWSGROUPS: + p_delete(&e->newsgroups); m_strrtrim(p); - e->followup_to = m_strdup(skipspaces(p)); - } - matched = 1; - } + e->newsgroups = m_strdup(skipspaces(p)); + break; #endif - break; - case 'i': - if (!ascii_strcasecmp (line + 1, "n-reply-to")) { - mutt_free_list (&e->in_reply_to); - e->in_reply_to = mutt_parse_references (p, 1); - matched = 1; - } - break; + case MIME_ORGANIZATION: + if (!e->organization && mime_which_token(p, -1) == MIME_UNKNOWN) + e->organization = m_strdup(p); + break; - case 'l': - if (!ascii_strcasecmp (line + 1, "ines")) { - if (hdr) { - hdr->lines = atoi (p); + case MIME_RECEIVED: + if (hdr && !hdr->received) { + char *d = strchr(p, ';'); + if (d) + hdr->received = mutt_parse_date(d + 1, NULL); + } + break; - /* - * HACK - mutt has, for a very short time, produced negative - * Lines header values. Ignore them. - */ - if (hdr->lines < 0) - hdr->lines = 0; - } + case MIME_REFERENCES: + string_list_wipe(&e->references); + e->references = mutt_parse_references(p, 0); + break; - matched = 1; - } - else if (!ascii_strcasecmp (line + 1, "ist-Post")) { - /* RFC 2369. FIXME: We should ignore whitespace, but don't. */ - if (strncmp (p, "NO", 2)) { - char *beg, *end; - - for (beg = strchr (p, '<'); beg; beg = strchr (end, ',')) { - ++beg; - if (!(end = strchr (beg, '>'))) - break; + case MIME_REPLY_TO: + e->reply_to = rfc822_parse_adrlist(e->reply_to, p); + break; - /* Take the first mailto URL */ - if (url_check_scheme (beg) == U_MAILTO) { - p_delete(&e->list_post); - e->list_post = p_dupstr(beg, end - beg); - break; - } + case MIME_RETURN_PATH: + e->return_path = rfc822_parse_adrlist(e->return_path, p); + break; + + case MIME_SENDER: + e->sender = rfc822_parse_adrlist (e->sender, p); + break; + + case MIME_STATUS: + if (hdr) { + while (*p) { + switch (*p) { + case 'r': + hdr->replied = 1; + break; + case 'O': + hdr->old = 1; + break; + case 'R': + hdr->read = 1; + break; + } + p++; + } } - } - matched = 1; - } - break; + break; - case 'm': - if (!ascii_strcasecmp (line + 1, "ime-version")) { - if (hdr) - hdr->mime = 1; - matched = 1; - } - else if (!ascii_strcasecmp (line + 1, "essage-id")) { - /* We add a new "Message-ID:" when building a message */ - p_delete(&e->message_id); - e->message_id = extract_message_id (p); - matched = 1; - } - else if (!ascii_strncasecmp (line + 1, "ail-", 4)) { - if (!ascii_strcasecmp (line + 5, "reply-to")) { - /* override the Reply-To: field */ - address_delete (&e->reply_to); - e->reply_to = rfc822_parse_adrlist (e->reply_to, p); - matched = 1; - } - else if (!ascii_strcasecmp (line + 5, "followup-to")) { - e->mail_followup_to = rfc822_parse_adrlist (e->mail_followup_to, p); - matched = 1; - } - } - break; + case MIME_SUBJECT: + if (!e->subject) + e->subject = m_strdup(p); + break; -#ifdef USE_NNTP - case 'n': - if (!m_strcasecmp(line + 1, "ewsgroups")) { - p_delete(&e->newsgroups); - m_strrtrim(p); - e->newsgroups = m_strdup(skipspaces(p)); - matched = 1; - } - break; -#endif + case MIME_SUPERCEDES: + case MIME_SUPERSEDES: + if (hdr) + e->supersedes = m_strdup(p); + break; - case 'o': - /* field `Organization:' saves only for pager! */ - if (!m_strcasecmp(line + 1, "rganization")) { - if (!e->organization && m_strcasecmp(p, "unknown")) - e->organization = m_strdup(p); - } - break; + case MIME_TO: + e->to = rfc822_parse_adrlist(e->to, p); + break; - case 'r': - if (!ascii_strcasecmp (line + 1, "eferences")) { - mutt_free_list (&e->references); - e->references = mutt_parse_references (p, 0); - matched = 1; - } - else if (!ascii_strcasecmp (line + 1, "eply-to")) { - e->reply_to = rfc822_parse_adrlist (e->reply_to, p); - matched = 1; - } - else if (!ascii_strcasecmp (line + 1, "eturn-path")) { - e->return_path = rfc822_parse_adrlist (e->return_path, p); - matched = 1; - } - else if (!ascii_strcasecmp (line + 1, "eceived")) { - if (hdr && !hdr->received) { - char *d = strchr (p, ';'); +#ifdef USE_NNTP + case MIME_X_COMMENT_TO: + if (!e->x_comment_to) + e->x_comment_to = m_strdup(p); + break; +#endif - if (d) - hdr->received = mutt_parse_date (d + 1, NULL); - } - } - break; + case MIME_X_LABEL: + e->x_label = m_strdup(p); + break; - case 's': - if (!ascii_strcasecmp (line + 1, "ubject")) { - if (!e->subject) - e->subject = m_strdup(p); - matched = 1; - } - else if (!ascii_strcasecmp (line + 1, "ender")) { - e->sender = rfc822_parse_adrlist (e->sender, p); - matched = 1; - } - else if (!ascii_strcasecmp (line + 1, "tatus")) { - if (hdr) { - while (*p) { - switch (*p) { - case 'r': - hdr->replied = 1; - break; - case 'O': - hdr->old = 1; - break; - case 'R': - hdr->read = 1; - break; - } - p++; - } - } - matched = 1; - } - else if ((!ascii_strcasecmp ("upersedes", line + 1) || - !ascii_strcasecmp ("upercedes", line + 1)) && hdr) - e->supersedes = m_strdup(p); - break; - - case 't': - if (ascii_strcasecmp (line + 1, "o") == 0) { - e->to = rfc822_parse_adrlist (e->to, p); - matched = 1; - } - break; - - case 'x': - if (ascii_strcasecmp (line + 1, "-status") == 0) { - if (hdr) { - while (*p) { - switch (*p) { - case 'A': - hdr->replied = 1; - break; - case 'D': - hdr->deleted = 1; - break; - case 'F': - hdr->flagged = 1; - break; - default: - break; - } - p++; - } - } - matched = 1; - } - else if (ascii_strcasecmp (line + 1, "-label") == 0) { - e->x_label = m_strdup(p); - matched = 1; - } #ifdef USE_NNTP - else if (!m_strcasecmp(line + 1, "-comment-to")) { - if (!e->x_comment_to) - e->x_comment_to = m_strdup(p); - matched = 1; - } - else if (!m_strcasecmp(line + 1, "ref")) { - if (!e->xref) - e->xref = m_strdup(p); - matched = 1; - } + case MIME_XREF: + if (!e->xref) + e->xref = m_strdup(p); + break; #endif - default: - break; - } + case MIME_X_STATUS: + if (hdr) { + while (*p) { + switch (*p) { + case 'A': + hdr->replied = 1; + break; + case 'D': + hdr->deleted = 1; + break; + case 'F': + hdr->flagged = 1; + break; + default: + break; + } + p++; + } + } + break; + + default: + if (!user_hdrs) + break; - /* Keep track of the user-defined headers */ - if (!matched && user_hdrs) { - /* 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)) - goto done; + if (weed && option(OPTWEED) && mutt_matches_ignore(line, Ignore) + && !mutt_matches_ignore(line, UnIgnore)) { + break; + } - if (last) { - last->next = mutt_new_list (); - last = last->next; + *user_hdrs = string_item_new(); + (*user_hdrs)->data = m_strdup(line); + if (do_2047) + rfc2047_decode(&(*user_hdrs)->data); + return &(*user_hdrs)->next; } - else - last = e->userhdrs = mutt_new_list (); - last->data = m_strdup(line); - if (do_2047) - rfc2047_decode (&last->data); - } -done: - - *lastp = last; - return matched; + return user_hdrs; } - /* mutt_read_rfc822_header() -- parses a RFC822 header * * Args: @@ -1175,267 +1007,189 @@ done: * Returns: newly allocated envelope structure. You should free it by * envelope_delete() when envelope stay unneeded. */ -ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs, - short weed) +ENVELOPE * +mutt_read_rfc822_header(FILE *f, HEADER *hdr, short user_hdrs, short weed) { - ENVELOPE *e = envelope_new(); - LIST *last = NULL; - char *line = p_new(char, LONG_STRING); - char *p; - off_t loc; - int matched; - ssize_t linelen = LONG_STRING; - char buf[LONG_STRING + 1]; - - if (hdr) { - if (hdr->content == NULL) { - hdr->content = mutt_new_body (); - - /* set the defaults from RFC1521 */ - hdr->content->type = TYPETEXT; - hdr->content->subtype = m_strdup("plain"); - hdr->content->encoding = ENC7BIT; - hdr->content->length = -1; - - /* RFC 2183 says this is arbitrary */ - hdr->content->disposition = DISPINLINE; - } - } - - while ((loc = ftello (f)), - mutt_read_rfc822_line (f, &line, &linelen)) - { - matched = 0; - - if ((p = strpbrk (line, ": \t")) == NULL || *p != ':') { - char return_path[LONG_STRING]; - time_t t; - - /* some bogus MTAs will quote the original "From " line */ - if (m_strncmp(">From ", line, 6) == 0) - continue; /* just ignore */ - else 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 */ - } + ENVELOPE *e = envelope_new(); + string_list_t **last = user_hdrs ? &e->userhdrs : NULL; - *buf = '\0'; - - 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 defined, append with separator */ - if (SpamSep) { - mutt_buffer_addstr (e->spam, SpamSep); - mutt_buffer_addstr (e->spam, buf); - } - - /* else overwrite */ - else { - e->spam->dptr = e->spam->data; - *e->spam->dptr = '\0'; - mutt_buffer_addstr (e->spam, buf); - } - } + char *line = p_new(char, LONG_STRING); + ssize_t linelen = LONG_STRING; + off_t loc; - /* spam tag is new, and match expr is non-empty; copy */ - else if (!e->spam && *buf) { - e->spam = mutt_buffer_from (NULL, buf); - } + if (hdr && !hdr->content) { + hdr->content = body_new(); - /* match expr is empty; plug in null string if no existing tag */ - else if (!e->spam) { - e->spam = mutt_buffer_from (NULL, ""); - } + /* set the defaults from RFC1521 */ + hdr->content->type = TYPETEXT; + hdr->content->subtype = m_strdup("plain"); + hdr->content->encoding = ENC7BIT; + hdr->content->length = -1; - if (e->spam && e->spam->data) - debug_print (5, ("spam = %s\n", e->spam->data)); - } + /* RFC 2183 says this is arbitrary */ + hdr->content->disposition = DISPINLINE; } - *p++ = 0; - p = vskipspaces(p); - if (!*p) - continue; /* skip empty header fields */ + while ((loc = ftello(f)), + mutt_read_rfc822_line(f, &line, &linelen)) + { + char buf[LONG_STRING + 1] = ""; + char *p; + + 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)) + 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; + } - matched = - mutt_parse_rfc822_line (e, hdr, line, p, user_hdrs, weed, 1, &last); + 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, ""); + } + } + } - p_delete(&line); + *p++ = '\0'; + p = vskipspaces(p); + if (!*p) + continue; /* skip empty header fields */ - if (hdr) { - hdr->content->hdr_offset = hdr->offset; - hdr->content->offset = ftello (f); - rfc2047_decode_envelope(e); - /* check for missing or invalid date */ - if (hdr->date_sent <= 0) { - debug_print (1, ("no date found, using received " - "time from msg separator\n")); - hdr->date_sent = hdr->received; + last = mutt_parse_rfc822_line(e, hdr, line, p, weed, 1, last); } - } - return (e); -} + p_delete(&line); -address_t *mutt_parse_adrlist (address_t * p, const char *s) -{ - const char *q; - - /* check for a simple whitespace separated list of addresses */ - if ((q = strpbrk (s, "\"<>():;,\\")) == NULL) { - char tmp[HUGE_STRING]; - char *r; - - m_strcpy(tmp, sizeof(tmp), s); - r = tmp; - while ((r = strtok (r, " \t")) != NULL) { - p = rfc822_parse_adrlist (p, r); - r = NULL; + if (hdr) { + hdr->content->hdr_offset = hdr->offset; + hdr->content->offset = ftello(f); + rfc2047_decode_envelope(e); + /* check for missing or invalid date */ + if (hdr->date_sent <= 0) { + hdr->date_sent = hdr->received; + } } - } - else - p = rfc822_parse_adrlist (p, s); - return p; + return e; } - /* Compares mime types to the ok and except lists */ -int count_body_parts_check(LIST **checklist, BODY *b, int dflt) { - LIST *type; - ATTACH_MATCH *a; +static int count_body_parts_check(string_list_t **checklist, BODY *b) +{ + string_list_t *type; - /* If list is null, use default behavior. */ - if (! *checklist) { - /*return dflt;*/ - return 0; - } - - for (type = *checklist; type; type = type->next) { - a = (ATTACH_MATCH *)type->data; - debug_print(5, ("cbpc: %s %d/%s ?? %s/%s [%d]... ", - dflt ? "[OK] " : "[EXCL] ", - b->type, b->subtype, a->major, a->minor, a->major_int)); - if ((a->major_int == TYPEANY || a->major_int == b->type) && - !regexec(&a->minor_rx, b->subtype, 0, NULL, 0)) { - debug_print(5, ("yes\n")); - return 1; - } else { - debug_print(5, ("no\n")); + for (type = *checklist; type; type = type->next) { + ATTACH_MATCH *a = (ATTACH_MATCH *)type->data; + + if ((a->major_int == TYPEANY || a->major_int == b->type) + && !regexec(&a->minor_rx, b->subtype, 0, NULL, 0)) { + return 1; + } } - } - return 0; + + return 0; } -#define AT_COUNT(why) { shallcount = 1; } -#define AT_NOCOUNT(why) { shallcount = 0; } +static int count_body_parts (BODY *body, int flags) +{ + int count = 0; + BODY *bp; -int count_body_parts (BODY *body, int flags) { - int count = 0; - int shallcount, shallrecurse; - BODY *bp; + if (!body) + return 0; - if (body == NULL) - return 0; + for (bp = body; bp != NULL; bp = bp->next) { + /* Initial disposition is to count and not to recurse this part. */ + int shallcount, shallrecurse, iscontainer; + int tok = mime_which_token(bp->subtype, -1); - for (bp = body; bp != NULL; bp = bp->next) { - /* Initial disposition is to count and not to recurse this part. */ - AT_COUNT("default"); - shallrecurse = 0; - - debug_print(5, ("bp: desc=\"%s\"; fn=\"%s\", type=\"%d/%s\"\n", - bp->description ? bp->description : ("none"), - bp->filename ? bp->filename : - bp->d_filename ? bp->d_filename : "(none)", - bp->type, bp->subtype ? bp->subtype : "*")); - - if (bp->type == TYPEMESSAGE) { - shallrecurse = 1; - - /* If it's an external body pointer, don't recurse it. */ - if (!ascii_strcasecmp (bp->subtype, "external-body")) - shallrecurse = 0; - - /* Don't count containers if they're top-level. */ - if (flags & M_PARTS_TOPLEVEL) - AT_NOCOUNT("top-level message/*"); - } else if (bp->type == TYPEMULTIPART) { - /* Always recurse multiparts, except multipart/alternative. */ - shallrecurse = 1; - if (!m_strcasecmp(bp->subtype, "alternative")) - shallrecurse = 0; - - /* Don't count containers if they're top-level. */ - if (flags & M_PARTS_TOPLEVEL) - AT_NOCOUNT("top-level multipart"); - } + iscontainer = bp->type == TYPEMESSAGE || bp->type == TYPEMULTIPART; - if (bp->disposition == DISPINLINE && - bp->type != TYPEMULTIPART && bp->type != TYPEMESSAGE && bp == body) - AT_NOCOUNT("ignore fundamental inlines"); - - /* If this body isn't scheduled for enumeration already, don't bother - * profiling it further. */ - - if (shallcount) { - /* Turn off shallcount if message type is not in ok list, - * or if it is in except list. Check is done separately for - * inlines vs. attachments. - */ - - if (bp->disposition == DISPATTACH) { - if (!count_body_parts_check(&AttachAllow, bp, 1)) - AT_NOCOUNT("attach not allowed"); - if (count_body_parts_check(&AttachExclude, bp, 0)) - AT_NOCOUNT("attach excluded"); - } else { - if (!count_body_parts_check(&InlineAllow, bp, 1)) - AT_NOCOUNT("inline not allowed"); - if (count_body_parts_check(&InlineExclude, bp, 0)) - AT_NOCOUNT("excluded"); - } - } + /* don't recurse in external bodies or multipart/alternatives */ + shallrecurse = (bp->type == TYPEMESSAGE && tok != MIME_EXTERNAL_BODY) + || (bp->type == TYPEMULTIPART && tok != MIME_ALTERNATIVE); + + /* Don't count top level containers and fundamental inlines */ + shallcount = !(iscontainer && (flags & M_PARTS_TOPLEVEL)) + && !(!iscontainer && bp->disposition == DISPINLINE && bp == body); + + if (shallcount) { + /* Turn off shallcount if message type is not in ok list, + * or if it is in except list. Check is done separately for + * inlines vs. attachments. + */ - if (shallcount) - count++; - bp->attach_qualifies = shallcount ? 1 : 0; + if (bp->disposition == DISPATTACH) { + if (!count_body_parts_check(&AttachAllow, bp)) + shallcount = 0; + if (count_body_parts_check(&AttachExclude, bp)) + shallcount = 0; + } else { + if (!count_body_parts_check(&InlineAllow, bp)) + shallcount = 0; + if (count_body_parts_check(&InlineExclude, bp)) + shallcount = 0; + } + } - debug_print(5, ("cbp: %p shallcount = %d\n", bp, shallcount)); + bp->attach_qualifies = shallcount; + count += shallcount; - if (shallrecurse) { - debug_print(5, ("cbp: %p pre count = %d\n", bp, count)); - bp->attach_count = count_body_parts(bp->parts, flags & ~M_PARTS_TOPLEVEL); - count += bp->attach_count; - debug_print(5, ("cbp: %p post count = %d\n", bp, count)); + if (shallrecurse) { + bp->attach_count = count_body_parts(bp->parts, + flags & ~M_PARTS_TOPLEVEL); + count += bp->attach_count; + } } - } - debug_print(5, ("bp: return %d\n", count < 0 ? 0 : count)); - return count < 0 ? 0 : count; + return count; } -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; +int mutt_count_body_parts(HEADER *hdr, int flags) +{ + if (!option(OPTCOUNTATTACH)) + return 0; - if (AttachAllow || AttachExclude || InlineAllow || InlineExclude) - hdr->attach_total = count_body_parts(hdr->content, flags | M_PARTS_TOPLEVEL); - else - hdr->attach_total = 0; + if (hdr->attach_valid && !(flags & M_PARTS_RECOUNT)) + return hdr->attach_total; - hdr->attach_valid = 1; - return hdr->attach_total; + if (AttachAllow || AttachExclude || InlineAllow || InlineExclude) + hdr->attach_total = count_body_parts(hdr->content, + flags | M_PARTS_TOPLEVEL); + else + hdr->attach_total = 0; + + hdr->attach_valid = 1; + return hdr->attach_total; }