X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc822parse.c;h=33012fd72052097ce0a02cda0509676c8625642f;hp=adc73d9a5c5b447133f7abf5e27cd0b2093aa542;hb=774b53097f8c8b62c5101bce8f313d339387a438;hpb=fa4c2af84416f9b4663bb80d36faaba35db05524 diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c index adc73d9..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; @@ -163,244 +159,221 @@ LIST *mutt_parse_references(char *s, int in_reply_to) return lst; } -int mutt_check_encoding (const char *c) +int mutt_check_encoding(const char *s) { - if (ascii_strncasecmp ("7bit", c, sizeof ("7bit") - 1) == 0) - return (ENC7BIT); - else if (ascii_strncasecmp ("8bit", c, sizeof ("8bit") - 1) == 0) - return (ENC8BIT); - else if (ascii_strncasecmp ("binary", c, sizeof ("binary") - 1) == 0) - return (ENCBINARY); - else - if (ascii_strncasecmp - ("quoted-printable", c, sizeof ("quoted-printable") - 1) == 0) - return (ENCQUOTEDPRINTABLE); - else if (ascii_strncasecmp ("base64", c, sizeof ("base64") - 1) == 0) - return (ENCBASE64); - else if (ascii_strncasecmp ("x-uuencode", c, sizeof ("x-uuencode") - 1) == 0) - return (ENCUUENCODED); - else - return (ENCOTHER); + 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; + } } -static PARAMETER *parse_parameters (const char *s) +int mutt_check_mime_type(const char *s) { - PARAMETER *head = 0, *cur = 0, *new; - char buffer[LONG_STRING]; - const char *p; - size_t i; - - debug_print (2, ("`%s'\n", s)); - - while (*s) { - if ((p = strpbrk (s, "=;")) == NULL) { - debug_print (1, ("malformed parameter: %s\n", s)); - goto bail; + 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; } +} - /* if we hit a ; now the parameter has no value, just skip it */ - if (*p != ';') { - i = p - s; +static parameter_t *parse_parameters(const char *s) +{ + parameter_t *res = NULL; + parameter_t **list = &res; - new = mutt_new_parameter (); + while (*s) { + const char *p; + parameter_t *new; + int i; - new->attribute = p_dupstr(s, i); + s = skipspaces(s); + if (*s == '=') /* parameters are fucked up, go away */ + break; - /* remove whitespace from the end of the attribute name */ - while (ISSPACE (new->attribute[--i])) - new->attribute[i] = 0; + p = strpbrk(s, "=;"); + if (!p) + break; - s = vskipspaces(p + 1); /* skip over the = */ + if (*p == ';') { + /* if we hit a ; now the parameter has no value, just skip it */ + s = p + 1; + continue; + } - if (*s == '"') { - int state_ascii = 1; + i = p - s; + new = parameter_new(); + new->attribute = p_dupstr(s, i); - s++; - for (i = 0; *s && i < sizeof (buffer) - 1; i++, s++) { - if (!option (OPTSTRICTMIME)) { - /* As iso-2022-* has a characer of '"' with non-ascii state, - * ignore it. */ - if (*s == 0x1b && i < sizeof (buffer) - 2) { - if (s[1] == '(' && (s[2] == 'B' || s[2] == 'J')) - state_ascii = 1; - else - state_ascii = 0; + while (--i >= 0 && ISSPACE(new->attribute[i])) { + new->attribute[i] = '\0'; + } + s = skipspaces(p + 1); /* skip over the = */ + + if (*s == '"') { + char buffer[LONG_STRING]; + int state_ascii = 1; + + 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'); + } + } + if (state_ascii && *s == '"') + break; + + if (*s == '\\') { + buffer[i] = *++s; + } else { + buffer[i] = *s; + } } - } - if (state_ascii && *s == '"') - break; - if (*s == '\\') { - /* Quote the next character */ - buffer[i] = s[1]; - if (!*++s) - break; - } - else - buffer[i] = *s; + + new->value = p_dupstr(buffer, i); + } else { + for (p = s; *p && *p != ' ' && *p != ';'; p++); + new->value = p_dupstr(s, p - s); } - buffer[i] = 0; - if (*s) - s++; /* skip over the " */ - } - else { - for (i = 0; *s && *s != ' ' && *s != ';' && i < sizeof (buffer) - 1; - i++, s++) - buffer[i] = *s; - buffer[i] = 0; - } - - new->value = m_strdup(buffer); - - debug_print (2, ("`%s' = `%s'\n", new->attribute ? new->attribute : "", - new->value ? new->value : "")); - - /* Add this parameter to the list */ - if (head) { - cur->next = new; - cur = cur->next; - } - else - head = cur = new; + + *list = new; + list = &new->next; + + s = strchr(s, ';'); /* Find the next parameter */ + if (!s) + break; /* no more parameters */ } - else { - debug_print (1, ("parameter with no value: %s\n", s)); - s = p; + + rfc2231_decode_parameters(&res); + return res; +} + +void mutt_parse_content_type(char *s, BODY *ct) +{ + char *pc; + char *subtype; + + p_delete(&ct->subtype); + parameter_list_wipe(&ct->parameter); + + /* First extract any existing parameters */ + if ((pc = strchr(s, ';')) != NULL) { + *pc++ = '\0'; + ct->parameter = parse_parameters(vskipspaces(pc)); + + /* 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 = parameter_getval(ct->parameter, "name"); + if (pc && !ct->filename) + ct->filename = m_strdup(pc); } - /* Find the next parameter */ - if (*s != ';' && (s = strchr (s, ';')) == NULL) - break; /* no more parameters */ + /* Now get the subtype */ + if ((subtype = strchr (s, '/'))) { + *subtype++ = '\0'; + for (pc = subtype; *pc && !ISSPACE(*pc) && *pc != ';'; pc++); + ct->subtype = p_dupstr(subtype, pc - subtype); + } + + /* Finally, get the major type */ + ct->type = mutt_check_mime_type(s); - do { - /* Move past any leading whitespace */ - s = vskipspaces(s + 1); + if (ct->type == TYPEOTHER) { + ct->xtype = m_strdup(s); } - while (*s == ';'); /* skip empty parameters */ - } -bail: + if (!ct->subtype) { + /* Some older non-MIME mailers (i.e., mailtool, elm) have a content-type + * field, so we can attempt to convert the type to BODY here. + */ + switch (ct->type) { + char buffer[SHORT_STRING]; - rfc2231_decode_parameters (&head); - return (head); -} + case TYPETEXT: + ct->subtype = m_strdup("plain"); + break; -int mutt_check_mime_type (const char *s) -{ - if (ascii_strcasecmp ("text", s) == 0) - return TYPETEXT; - else if (ascii_strcasecmp ("multipart", s) == 0) - return TYPEMULTIPART; - else if (ascii_strcasecmp ("application", s) == 0) - return TYPEAPPLICATION; - else if (ascii_strcasecmp ("message", s) == 0) - return TYPEMESSAGE; - else if (ascii_strcasecmp ("image", s) == 0) - return TYPEIMAGE; - else if (ascii_strcasecmp ("audio", s) == 0) - return TYPEAUDIO; - else if (ascii_strcasecmp ("video", s) == 0) - return TYPEVIDEO; - else if (ascii_strcasecmp ("model", s) == 0) - return TYPEMODEL; - else if (ascii_strcasecmp ("*", s) == 0) - return TYPEANY; - else if (ascii_strcasecmp (".*", s) == 0) - return TYPEANY; - else - return TYPEOTHER; -} + case TYPEAUDIO: + ct->subtype = m_strdup("basic"); + break; -void mutt_parse_content_type (char *s, BODY * ct) -{ - char *pc; - char *subtype; - - p_delete(&ct->subtype); - mutt_free_parameter (&ct->parameter); - - /* First extract any existing parameters */ - if ((pc = strchr (s, ';')) != NULL) { - *pc++ = 0; - while (*pc && ISSPACE (*pc)) - pc++; - ct->parameter = parse_parameters (pc); - - /* 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 */ - if ((pc = mutt_get_parameter ("name", ct->parameter)) != 0 - && !ct->filename) - ct->filename = m_strdup(pc); - } - - /* Now get the subtype */ - if ((subtype = strchr (s, '/'))) { - *subtype++ = '\0'; - for (pc = subtype; *pc && !ISSPACE (*pc) && *pc != ';'; pc++); - *pc = '\0'; - ct->subtype = m_strdup(subtype); - } - - /* Finally, get the major type */ - ct->type = mutt_check_mime_type (s); - - if (ct->type == TYPEOTHER) { - ct->xtype = m_strdup(s); - } - - if (ct->subtype == NULL) { - /* Some older non-MIME mailers (i.e., mailtool, elm) have a content-type - * field, so we can attempt to convert the type to BODY here. - */ - if (ct->type == TYPETEXT) - ct->subtype = m_strdup("plain"); - else if (ct->type == TYPEAUDIO) - ct->subtype = m_strdup("basic"); - else if (ct->type == TYPEMESSAGE) - ct->subtype = m_strdup("rfc822"); - else if (ct->type == TYPEOTHER) { - char buffer[SHORT_STRING]; - - ct->type = TYPEAPPLICATION; - snprintf (buffer, sizeof (buffer), "x-%s", s); - ct->subtype = m_strdup(buffer); + case TYPEMESSAGE: + ct->subtype = m_strdup("rfc822"); + break; + + case TYPEOTHER: + ct->type = TYPEAPPLICATION; + snprintf(buffer, sizeof(buffer), "x-%s", s); + ct->subtype = m_strdup(buffer); + break; + + default: + ct->subtype = m_strdup("x-unknown"); + break; + } } - else - ct->subtype = m_strdup("x-unknown"); - } - - /* Default character set for text types. */ - if (ct->type == TYPETEXT) { - if (!(pc = mutt_get_parameter ("charset", ct->parameter))) - mutt_set_parameter ("charset", option (OPTSTRICTMIME) ? "us-ascii" : - (const char *) - mutt_get_first_charset (AssumedCharset), - &ct->parameter); - } + /* Default character set for text types. */ + if (ct->type == TYPETEXT) { + pc = parameter_getval(ct->parameter, "charset"); + if (!pc) { + 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) { - PARAMETER *parms; - - if (!ascii_strncasecmp ("inline", s, 6)) - ct->disposition = DISPINLINE; - else if (!ascii_strncasecmp ("form-data", s, 9)) - ct->disposition = DISPFORMDATA; - else - ct->disposition = DISPATTACH; - - /* Check to see if a default filename was given */ - if ((s = strchr (s, ';')) != NULL) { - s = vskipspaces(s + 1); - if ((s = mutt_get_parameter("filename", - (parms = parse_parameters (s)))) != 0) - m_strreplace(&ct->filename, s); - if ((s = mutt_get_parameter ("name", parms)) != 0) - ct->form_name = m_strdup(s); - mutt_free_parameter (&parms); - } + if (!ascii_strncasecmp(s, "inline", 6)) { + ct->disposition = DISPINLINE; + } else if (!ascii_strncasecmp(s, "form-data", 9)) { + ct->disposition = DISPFORMDATA; + } else { + ct->disposition = DISPATTACH; + } + + /* Check to see if a default filename was given */ + if ((s = strchr (s, ';'))) { + parameter_t *parms = parse_parameters(vskipspaces(s)); + + if ((s = parameter_getval(parms, "filename"))) + m_strreplace(&ct->filename, s); + if ((s = parameter_getval(parms, "name"))) + ct->form_name = m_strdup(s); + + parameter_list_wipe(&parms); + } } /* args: @@ -409,94 +382,99 @@ static void parse_content_disposition (char *s, BODY * ct) * digest 1 if reading subparts of a multipart/digest, 0 * otherwise */ - -BODY *mutt_read_mime_header (FILE * fp, int digest) +BODY *mutt_read_mime_header(FILE *fp, int digest) { - BODY *p = mutt_new_body (); - char *c; - char *line = p_new(char, LONG_STRING); - ssize_t linelen = LONG_STRING; - - p->hdr_offset = ftello (fp); - - p->encoding = ENC7BIT; /* default from RFC1521 */ - p->type = digest ? TYPEMESSAGE : TYPETEXT; - p->disposition = DISPINLINE; - - while (mutt_read_rfc822_line(fp, &line, &linelen)) { - /* Find the value of the current header */ - if ((c = strchr (line, ':'))) { - *c++ = 0; - c = vskipspaces(c); - if (!*c) { - debug_print (1, ("skipping empty header field: %s\n", line)); - continue; - } - } - else { - debug_print (1, ("bogus MIME header: %s\n", line)); - break; - } + BODY *body = body_new(); + char *line = p_new(char, LONG_STRING); + ssize_t linelen = LONG_STRING; + char *p; + + body->hdr_offset = ftello(fp); + body->encoding = ENC7BIT; /* default from RFC1521 */ + body->disposition = DISPINLINE; + body->type = digest ? TYPEMESSAGE : TYPETEXT; + + while (mutt_read_rfc822_line(fp, &line, &linelen)) { + /* Find the value of the current header */ + if ((p = strchr(line, ':'))) { + *p++ = '\0'; + p = vskipspaces(p); + if (!*p) + continue; + } else { + break; + } + + switch (mime_which_token(line, -1)) { + case MIME_CONTENT_TYPE: + mutt_parse_content_type (p, body); + break; - if (!ascii_strncasecmp ("content-", line, 8)) { - if (!ascii_strcasecmp ("type", line + 8)) - mutt_parse_content_type (c, p); - else if (!ascii_strcasecmp ("transfer-encoding", line + 8)) - p->encoding = mutt_check_encoding (c); - else if (!ascii_strcasecmp ("disposition", line + 8)) - parse_content_disposition (c, p); - else if (!ascii_strcasecmp ("description", line + 8)) { - m_strreplace(&p->description, c); - rfc2047_decode (&p->description); - } + 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; + } } - } - p->offset = ftello (fp); /* Mark the start of the real data */ - if (p->type == TYPETEXT && !p->subtype) - p->subtype = m_strdup("plain"); - else if (p->type == TYPEMESSAGE && !p->subtype) - p->subtype = m_strdup("rfc822"); - p_delete(&line); + body->offset = ftello(fp); /* Mark the start of the real data */ + if (!body->subtype) { + if (body->type == TYPETEXT) + body->subtype = m_strdup("plain"); + if (body->type == TYPEMESSAGE) + body->subtype = m_strdup("rfc822"); + } - return (p); + p_delete(&line); + return (body); } -void mutt_parse_part (FILE * fp, BODY * b) +void mutt_parse_part(FILE *fp, BODY *b) { - char *bound = 0; - - switch (b->type) { - case TYPEMULTIPART: - bound = mutt_get_parameter ("boundary", b->parameter); - fseeko (fp, b->offset, SEEK_SET); - b->parts = mutt_parse_multipart (fp, bound, - b->offset + b->length, - ascii_strcasecmp ("digest", - b->subtype) == 0); - break; - - case TYPEMESSAGE: - if (b->subtype) { - fseeko (fp, b->offset, SEEK_SET); - 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) - b->parts = mutt_read_mime_header (fp, 0); - else + char *bound = 0; + + switch (b->type) { + case TYPEMULTIPART: + bound = parameter_getval(b->parameter, "boundary"); + fseeko(fp, b->offset, SEEK_SET); + b->parts = mutt_parse_multipart(fp, bound, b->offset + b->length, + mime_which_token(b->subtype, -1) == MIME_DIGEST); + break; + + case TYPEMESSAGE: + if (b->subtype) { + fseeko(fp, b->offset, SEEK_SET); + + if (mutt_is_message_type(b->type, b->subtype)) { + b->parts = mutt_parse_messageRFC822(fp, b); + } else + if (mime_which_token(b->subtype, -1) == MIME_EXTERNAL_BODY) { + b->parts = mutt_read_mime_header(fp, 0); + } else { + return; + } + } + break; + + default: return; } - break; - - default: - return; - } - /* try to recover from parsing error */ - if (!b->parts) { - b->type = TYPETEXT; - m_strreplace(&b->subtype, "plain"); - } + /* try to recover from parsing error */ + if (!b->parts) { + b->type = TYPETEXT; + m_strreplace(&b->subtype, "plain"); + } } /* parse a MESSAGE/RFC822 body @@ -509,27 +487,25 @@ void mutt_parse_part (FILE * fp, BODY * b) * * NOTE: this assumes that `parent->length' has been set! */ - -BODY *mutt_parse_messageRFC822 (FILE * fp, BODY * parent) +BODY *mutt_parse_messageRFC822(FILE * fp, BODY * parent) { - BODY *msg; + BODY *msg; - parent->hdr = mutt_new_header (); - parent->hdr->offset = ftello (fp); - parent->hdr->env = mutt_read_rfc822_header (fp, parent->hdr, 0, 0); - msg = parent->hdr->content; + parent->hdr = header_new(); + parent->hdr->offset = ftello(fp); + parent->hdr->env = mutt_read_rfc822_header(fp, parent->hdr, 0, 0); - /* ignore the length given in the content-length since it could be wrong - and we already have the info to calculate the correct length */ - /* if (msg->length == -1) */ - msg->length = parent->length - (msg->offset - parent->offset); + msg = parent->hdr->content; - /* if body of this message is empty, we can end up with a negative length */ - if (msg->length < 0) - msg->length = 0; + /* ignore the length given in the content-length since it could be wrong + and we already have the info to calculate the correct length */ + /* if (msg->length == -1) */ + /* if body of this message is empty, we can end up with a negative length */ + msg->length = MAX(0, parent->length - (msg->offset - parent->offset)); - mutt_parse_part (fp, msg); - return (msg); + mutt_parse_part(fp, msg); + + return msg; } /* parse a multipart structure @@ -537,7 +513,7 @@ BODY *mutt_parse_messageRFC822 (FILE * fp, BODY * parent) * args: * fp stream to read from * - * boundary body separator + * bound body separator * * end_off length of the multipart body (used when the final * boundary is missing to avoid reading too far) @@ -545,189 +521,99 @@ BODY *mutt_parse_messageRFC822 (FILE * fp, BODY * parent) * digest 1 if reading a multipart/digest, 0 otherwise */ -BODY *mutt_parse_multipart (FILE * fp, const char *boundary, off_t end_off, - int digest) +BODY * +mutt_parse_multipart(FILE *fp, const char *bound, off_t end_off, int digest) { - int blen, len, crlf = 0; - char buffer[LONG_STRING]; - BODY *head = 0, *last = 0, *new = 0; - int i; - int final = 0; /* did we see the ending boundary? */ - - if (!boundary) { - mutt_error _("multipart message has no boundary parameter!"); - - return (NULL); - } - - blen = m_strlen(boundary); - while (ftello (fp) < end_off && fgets (buffer, LONG_STRING, fp) != NULL) { - len = m_strlen(buffer); - - crlf = (len > 1 && buffer[len - 2] == '\r') ? 1 : 0; - - if (buffer[0] == '-' && buffer[1] == '-' && - m_strncmp(buffer + 2, boundary, blen) == 0) { - if (last) { - last->length = ftello (fp) - last->offset - len - 1 - crlf; - if (last->parts && last->parts->length == 0) - last->parts->length = - ftello (fp) - last->parts->offset - len - 1 - crlf; - /* if the body is empty, we can end up with a -1 length */ - if (last->length < 0) - last->length = 0; - } - - /* Remove any trailing whitespace, up to the length of the boundary */ - for (i = len - 1; ISSPACE (buffer[i]) && i >= blen + 2; i--) - buffer[i] = 0; - - /* Check for the end boundary */ - if (m_strcmp(buffer + blen + 2, "--") == 0) { - final = 1; - break; /* done parsing */ - } - else if (buffer[2 + blen] == 0) { - new = mutt_read_mime_header (fp, digest); - - /* - * Consistency checking - catch - * bad attachment end boundaries - */ + char buffer[LONG_STRING]; + BODY *head = NULL; + BODY **last = &head; + int blen = m_strlen(bound); + int final = 0; /* did we see the ending boundary? */ + + if (!blen) { + mutt_error _("multipart message has no boundary parameter!"); + return NULL; + } - if (new->offset > end_off) { - mutt_free_body (&new); - break; - } - if (head) { - last->next = new; - last = new; + while (ftello(fp) < end_off && fgets(buffer, sizeof(buffer), fp)) { + int len, crlf, i; + + len = m_strlen(buffer); + crlf = len > 1 && buffer[len - 2] == '\r'; + + if (buffer[0] == '-' && buffer[1] == '-' + && !m_strncmp(buffer + 2, bound, blen)) + { + if (*last) { + BODY *b = *last; + + /* if the body is empty, we can end up with a -1 length */ + b->length = MAX(0, ftello(fp) - b->offset - len - 1 - crlf); + if (b->parts && b->parts->length == 0) { + b->parts->length = ftello(fp) - b->parts->offset + - len - 1 - crlf; + } + } + + /* Remove any trailing whitespace, up to the length of the boundary */ + for (i = len - 1; ISSPACE(buffer[i]) && i >= blen + 2; i--) + buffer[i] = '\0'; + + /* Check for the end boundary */ + final = buffer[blen + 3] == '-' && buffer[blen + 4] == '-'; + if (final) + break; + + if (buffer[2 + blen] == '\0') { + BODY *new = mutt_read_mime_header(fp, digest); + + /* + * Consistency checking - catch + * bad attachment end boundaries + */ + + if (new->offset > end_off) { + body_list_wipe(&new); + break; + } + + if (*last) + last = &(*last)->next; + *last = new; + } } - else - last = head = new; - } } - } - /* in case of missing end boundary, set the length to something reasonable */ - if (last && last->length == 0 && !final) - last->length = end_off - last->offset; + /* in case of missing end boundary, set the length to something reasonable */ + if (*last && (*last)->length == 0 && !final) + (*last)->length = end_off - (*last)->offset; - /* parse recursive MIME parts */ - for (last = head; last; last = last->next) - mutt_parse_part (fp, last); + /* parse recursive MIME parts */ + { + BODY *b; + for (b = head; b; b = b->next) + mutt_parse_part(fp, b); + } - return (head); + return (head); } -static const char *uncomment_timezone (char *buf, size_t buflen, - const char *tz) +static const char * +uncomment_timezone(char *buf, size_t buflen, const char *tz) { - char *p; - size_t len; - - if (*tz != '(') - return tz; /* no need to do anything */ - tz = vskipspaces(tz + 1); - if ((p = strpbrk (tz, " )")) == NULL) - return tz; - len = p - tz; - if (len > buflen - 1) - len = buflen - 1; - memcpy (buf, tz, len); - buf[len] = 0; - return buf; -} + char *p; + + if (*tz != '(') + return tz; /* no need to do anything */ -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 */ -}; + 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: * @@ -736,503 +622,373 @@ static struct tz_t { * This routine assumes that `h' has been initialized to 0. the `timezone' * field is optional, defaulting to +0000 if missing. */ -time_t mutt_parse_date (const char *s, HEADER * h) +time_t mutt_parse_date(const char *s, HEADER *h) { - int count = 0; - char *t; - int hour, min, sec; - struct tm tm; - int i; - int tz_offset = 0; - int zhours = 0; - int zminutes = 0; - int zoccident = 0; - const char *ptz; - char tzstr[SHORT_STRING]; - char scratch[SHORT_STRING]; - - /* 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. */ - if ((t = strchr (scratch, ','))) - t++; - else - t = scratch; - t = vskipspaces(t); - - p_clear(&tm, 1); - - while ((t = strtok (t, " \t")) != NULL) { - switch (count) { - case 0: /* day of the month */ - if (!isdigit ((unsigned char) *t)) - return (-1); - tm.tm_mday = atoi (t); - if (tm.tm_mday > 31) - return (-1); - break; - - case 1: /* month of the year */ - if ((i = mutt_check_month (t)) < 0) - return (-1); - tm.tm_mon = i; - break; - - case 2: /* year */ - tm.tm_year = atoi (t); - 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 */ - if (sscanf (t, "%d:%d:%d", &hour, &min, &sec) == 3); - else if (sscanf (t, "%d:%d", &hour, &min) == 2) - sec = 0; - else { - debug_print (1, ("could not process time format: %s\n", t)); - return (-1); - } - tm.tm_hour = hour; - tm.tm_min = min; - tm.tm_sec = sec; - 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), t); - - if (*ptz == '+' || *ptz == '-') { - if (ptz[1] && ptz[2] && ptz[3] && ptz[4] - && isdigit ((unsigned char) ptz[1]) - && isdigit ((unsigned char) ptz[2]) - && isdigit ((unsigned char) ptz[3]) - && isdigit ((unsigned char) ptz[4])) { - zhours = (ptz[1] - '0') * 10 + (ptz[2] - '0'); - zminutes = (ptz[3] - '0') * 10 + (ptz[4] - '0'); - - if (ptz[0] == '-') - zoccident = 1; - } - } - else { - struct tz_t *tz; - - tz = bsearch (ptz, TimeZones, sizeof TimeZones / sizeof (struct tz_t), - sizeof (struct tz_t), - (int (*)(const void *, const void *)) ascii_strcasecmp - /* This is safe to do: A pointer to a struct equals - * a pointer to its first element*/ ); - - if (tz) { - zhours = tz->zhours; - zminutes = tz->zminutes; - zoccident = tz->zoccident; - } + 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); + + 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)) + 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; - /* ad hoc support for the European MET (now officially CET) TZ */ - if (ascii_strcasecmp (t, "MET") == 0) { - if ((t = strtok (NULL, " \t")) != NULL) { - if (!ascii_strcasecmp (t, "DST")) - zhours++; - } + 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; } - } - tz_offset = zhours * 3600 + zminutes * 60; - if (!zoccident) - tz_offset = -tz_offset; - break; + count++; + p = NULL; } - count++; - t = 0; - } - - if (count < 4) { /* don't check for missing timezone */ - debug_print (1, ("error parsing date format, using received time\n")); - return (-1); - } - - if (h) { - h->zhours = zhours; - h->zminutes = zminutes; - h->zoccident = zoccident; - } - - return (mutt_mktime (&tm, 0) + tz_offset); -} -/* extract the first substring that looks like a message-id */ -static char *extract_message_id(const char *s) -{ - const char *p; + if (count < 4) { /* don't check for missing timezone */ + return -1; + } - if ((s = strchr(s, '<')) == NULL || (p = strchr(s, '>')) == NULL) - return NULL; - return p_dupstr(s, (p - s) + 1); + if (h) { + h->zhours = zhours; + h->zminutes = zminutes; + h->zoccident = zoccident; + } + + return mutt_mktime(&tm, 0) + (zoccident ? 1 : -1) * (zhours * 3600 + zminutes * 60); } -void mutt_parse_mime_message (CONTEXT * ctx, HEADER * cur) +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) { - MESSAGE *msg; - int flags = 0; - - do { - if (cur->content->type != TYPEMESSAGE - && cur->content->type != TYPEMULTIPART) - break; /* nothing to do */ + switch (mime_which_token(line, -1)) { + case MIME_APPARENTLY_FROM: + e->from = rfc822_parse_adrlist (e->from, p); + break; - if (cur->content->parts) - break; /* The message was parsed earlier. */ + case MIME_APPARENTLY_TO: + e->to = rfc822_parse_adrlist (e->to, p); + break; - if ((msg = mx_open_message (ctx, cur->msgno))) { - mutt_parse_part (msg->fp, cur->content); + case MIME_BCC: + e->bcc = rfc822_parse_adrlist (e->bcc, p); + break; - cur->security = crypt_query (cur->content); - - mx_close_message (&msg); - } - } while (0); - mutt_count_body_parts (cur, flags | M_PARTS_RECOUNT); -} + case MIME_CC: + e->cc = rfc822_parse_adrlist (e->cc, 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_DESCRIPTION: + if (hdr) { + m_strreplace(&hdr->content->description, p); + rfc2047_decode(&hdr->content->description); + } + break; - if (lastp) - last = *lastp; + case MIME_CONTENT_DISPOSITION: + if (hdr) + parse_content_disposition(p, hdr->content); + 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_CONTENT_LENGTH: + if (hdr) { + if ((hdr->content->length = atoi(p)) < 0) + hdr->content->length = -1; + } + break; - case 'b': - if (ascii_strcasecmp (line + 1, "cc") == 0) { - e->bcc = rfc822_parse_adrlist (e->bcc, p); - matched = 1; - } - break; + case MIME_CONTENT_TRANSFER_ENCODING: + if (hdr) + hdr->content->encoding = mutt_check_encoding(p); + break; - 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) { + case MIME_CONTENT_TYPE: if (hdr) - mutt_parse_content_type (p, hdr->content); - matched = 1; - } - else if (ascii_strcasecmp (line + 8, "transfer-encoding") == 0) { + mutt_parse_content_type (p, hdr->content); + break; + + case MIME_DATE: + m_strreplace(&e->date, p); 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; + hdr->date_sent = mutt_parse_date (p, hdr); + break; + + case MIME_EXPIRES: + if (hdr && mutt_parse_date (p, NULL) < time (NULL)) + 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 + * 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)); + } + 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); } - matched = 1; - } - else if (ascii_strcasecmp (line + 8, "disposition") == 0) { + 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: @@ -1249,269 +1005,191 @@ done: * Used for recall-message. * * Returns: newly allocated envelope structure. You should free it by - * mutt_free_envelope() when envelope stay unneeded. + * 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 = mutt_new_envelope (); - 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; - - /* 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")); - } - } - return 0; -} - -#define AT_COUNT(why) { shallcount = 1; } -#define AT_NOCOUNT(why) { shallcount = 0; } - -int count_body_parts (BODY *body, int flags) { - int count = 0; - int shallcount, shallrecurse; - BODY *bp; +static int count_body_parts_check(string_list_t **checklist, BODY *b) +{ + string_list_t *type; - if (body == NULL) - return 0; + for (type = *checklist; type; type = type->next) { + ATTACH_MATCH *a = (ATTACH_MATCH *)type->data; - 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"); + if ((a->major_int == TYPEANY || a->major_int == b->type) + && !regexec(&a->minor_rx, b->subtype, 0, NULL, 0)) { + return 1; + } } - 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"); - } - } + return 0; +} - if (shallcount) - count++; - bp->attach_qualifies = shallcount ? 1 : 0; +static int count_body_parts (BODY *body, int flags) +{ + int count = 0; + BODY *bp; + + if (!body) + 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); + + iscontainer = bp->type == TYPEMESSAGE || bp->type == TYPEMULTIPART; + + /* 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 (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; }