#include <lib-lib/macros.h>
#include <lib-lib/buffer.h>
#include <lib-lib/date.h>
+#include <lib-lib/debug.h>
+#include <lib-lib/url.h>
#include "recvattach.h"
-#include "url.h"
-
-#include "lib/debug.h"
#include "mime.h"
}
/* 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;
*/
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;
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)
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) {
if ((s = mutt_get_parameter ("name", parms)))
ct->form_name = m_strdup(s);
- parameter_delete(&parms);
+ parameter_list_wipe(&parms);
}
}
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;
}
}
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));
+ mime_which_token(b->subtype, -1) == MIME_DIGEST);
break;
case TYPEMESSAGE:
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;
return mutt_mktime(&tm, 0) + (zoccident ? 1 : -1) * (zhours * 3600 + zminutes * 60);
}
-#include "rfc822hdrs.h"
-
-LIST **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p,
- short weed, short do_2047, LIST **user_hdrs)
+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)
{
- switch (rfc822_well_known(line)) {
- case HDR_APPARENTLY_FROM:
+ switch (mime_which_token(line, -1)) {
+ case MIME_APPARENTLY_FROM:
e->from = rfc822_parse_adrlist (e->from, p);
break;
- case HDR_APPARENTLY_TO:
+ case MIME_APPARENTLY_TO:
e->to = rfc822_parse_adrlist (e->to, p);
break;
- case HDR_BCC:
+ case MIME_BCC:
e->bcc = rfc822_parse_adrlist (e->bcc, p);
break;
- case HDR_CC:
+ case MIME_CC:
e->cc = rfc822_parse_adrlist (e->cc, p);
break;
- case HDR_CONTENT_DESCRIPTION:
+ case MIME_CONTENT_DESCRIPTION:
if (hdr) {
m_strreplace(&hdr->content->description, p);
rfc2047_decode(&hdr->content->description);
}
break;
- case HDR_CONTENT_DISPOSITION:
+ case MIME_CONTENT_DISPOSITION:
if (hdr)
parse_content_disposition(p, hdr->content);
break;
- case HDR_CONTENT_LENGTH:
+ case MIME_CONTENT_LENGTH:
if (hdr) {
if ((hdr->content->length = atoi(p)) < 0)
hdr->content->length = -1;
}
break;
- case HDR_CONTENT_TRANSFER_ENCODING:
+ case MIME_CONTENT_TRANSFER_ENCODING:
if (hdr)
hdr->content->encoding = mutt_check_encoding(p);
break;
- case HDR_CONTENT_TYPE:
+ case MIME_CONTENT_TYPE:
if (hdr)
mutt_parse_content_type (p, hdr->content);
break;
- case HDR_DATE:
+ case MIME_DATE:
m_strreplace(&e->date, p);
if (hdr)
hdr->date_sent = mutt_parse_date (p, hdr);
break;
- case HDR_EXPIRES:
+ case MIME_EXPIRES:
if (hdr && mutt_parse_date (p, NULL) < time (NULL))
hdr->expired = 1;
break;
#ifdef USE_NNTP
- case HDR_FOLLOWUP_TO:
+ case MIME_FOLLOWUP_TO:
if (!e->followup_to) {
m_strrtrim(p);
e->followup_to = m_strdup(skipspaces(p));
break;
#endif
- case HDR_FROM:
+ 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
}
break;
- case HDR_IN_REPLY_TO:
- mutt_free_list(&e->in_reply_to);
+ case MIME_IN_REPLY_TO:
+ string_list_wipe(&e->in_reply_to);
e->in_reply_to = mutt_parse_references(p, 1);
break;
- case HDR_LINES:
+ case MIME_LINES:
if (hdr) {
/* HACK - mutt has, for a very short time, produced negative
Lines header values. Ignore them. */
}
break;
- case HDR_LIST_POST:
+ case MIME_LIST_POST:
/* RFC 2369. FIXME: We should ignore whitespace, but don't. */
if (strncmp(p, "NO", 2)) {
char *beg, *end;
}
break;
- case HDR_MAIL_FOLLOWUP_TO:
+ case MIME_MAIL_FOLLOWUP_TO:
e->mail_followup_to = rfc822_parse_adrlist(e->mail_followup_to, p);
break;
- case HDR_MAIL_REPLY_TO:
- address_delete (&e->reply_to);
+ case MIME_MAIL_REPLY_TO:
+ address_list_wipe(&e->reply_to);
e->reply_to = rfc822_parse_adrlist(e->reply_to, p);
break;
- case HDR_MESSAGE_ID:
+ case MIME_MESSAGE_ID:
{
const char *beg, *end;
}
break;
- case HDR_MIME_VERSION:
+ case MIME_MIME_VERSION:
if (hdr)
hdr->mime = 1;
break;
#ifdef USE_NNTP
- case HDR_NEWSGROUPS:
+ case MIME_NEWSGROUPS:
p_delete(&e->newsgroups);
m_strrtrim(p);
e->newsgroups = m_strdup(skipspaces(p));
break;
#endif
- case HDR_ORGANIZATION:
- if (!e->organization && m_strcasecmp(p, "unknown"))
+ case MIME_ORGANIZATION:
+ if (!e->organization && mime_which_token(p, -1) == MIME_UNKNOWN)
e->organization = m_strdup(p);
break;
- case HDR_RECEIVED:
+ case MIME_RECEIVED:
if (hdr && !hdr->received) {
char *d = strchr(p, ';');
if (d)
}
break;
- case HDR_REFERENCES:
- mutt_free_list(&e->references);
+ case MIME_REFERENCES:
+ string_list_wipe(&e->references);
e->references = mutt_parse_references(p, 0);
break;
- case HDR_REPLY_TO:
+ case MIME_REPLY_TO:
e->reply_to = rfc822_parse_adrlist(e->reply_to, p);
break;
- case HDR_RETURN_PATH:
+ case MIME_RETURN_PATH:
e->return_path = rfc822_parse_adrlist(e->return_path, p);
break;
- case HDR_SENDER:
+ case MIME_SENDER:
e->sender = rfc822_parse_adrlist (e->sender, p);
break;
- case HDR_STATUS:
+ case MIME_STATUS:
if (hdr) {
while (*p) {
switch (*p) {
}
break;
- case HDR_SUBJECT:
+ case MIME_SUBJECT:
if (!e->subject)
e->subject = m_strdup(p);
break;
- case HDR_SUPERCEDES:
- case HDR_SUPERSEDES:
+ case MIME_SUPERCEDES:
+ case MIME_SUPERSEDES:
if (hdr)
e->supersedes = m_strdup(p);
break;
- case HDR_TO:
+ case MIME_TO:
e->to = rfc822_parse_adrlist(e->to, p);
break;
#ifdef USE_NNTP
- case HDR_X_COMMENT_TO:
+ case MIME_X_COMMENT_TO:
if (!e->x_comment_to)
e->x_comment_to = m_strdup(p);
break;
#endif
- case HDR_X_LABEL:
+ case MIME_X_LABEL:
e->x_label = m_strdup(p);
break;
#ifdef USE_NNTP
- case HDR_XREF:
+ case MIME_XREF:
if (!e->xref)
e->xref = m_strdup(p);
break;
#endif
- case HDR_X_STATUS:
+ case MIME_X_STATUS:
if (hdr) {
while (*p) {
switch (*p) {
break;
}
- *user_hdrs = mutt_new_list();
+ *user_hdrs = string_item_new();
(*user_hdrs)->data = m_strdup(line);
if (do_2047)
rfc2047_decode(&(*user_hdrs)->data);
- (*user_hdrs)->next = mutt_new_list();
return &(*user_hdrs)->next;
}
mutt_read_rfc822_header(FILE *f, HEADER *hdr, short user_hdrs, short weed)
{
ENVELOPE *e = envelope_new();
- LIST **last = user_hdrs ? &e->userhdrs : NULL;
+ string_list_t **last = user_hdrs ? &e->userhdrs : NULL;
char *line = p_new(char, LONG_STRING);
ssize_t linelen = LONG_STRING;
return e;
}
-/* -------------------- XXX: MC READ MARK ------------- */
-
/* Compares mime types to the ok and except lists */
-static int count_body_parts_check(LIST **checklist, BODY *b, int dflt)
+static int count_body_parts_check(string_list_t **checklist, BODY *b)
{
- LIST *type;
- ATTACH_MATCH *a;
-
- /* If list is null, use default behavior. */
- if (!*checklist)
- return 0;
+ string_list_t *type;
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"));
+ 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;
- } else {
- debug_print(5, ("no\n"));
}
}
+
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;
}
projects / apps / madmutt.git / blobdiff