#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;
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);
}
}
return mutt_mktime(&tm, 0) + (zoccident ? 1 : -1) * (zhours * 3600 + zminutes * 60);
}
-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 (mime_which_token(line, -1)) {
case MIME_APPARENTLY_FROM:
break;
case MIME_IN_REPLY_TO:
- mutt_free_list(&e->in_reply_to);
+ string_list_wipe(&e->in_reply_to);
e->in_reply_to = mutt_parse_references(p, 1);
break;
break;
case MIME_MAIL_REPLY_TO:
- address_delete (&e->reply_to);
+ address_list_wipe(&e->reply_to);
e->reply_to = rfc822_parse_adrlist(e->reply_to, p);
break;
break;
case MIME_REFERENCES:
- mutt_free_list(&e->references);
+ string_list_wipe(&e->references);
e->references = mutt_parse_references(p, 0);
break;
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;
}
/* Compares mime types to the ok and except lists */
-static int count_body_parts_check(LIST **checklist, BODY *b)
+static int count_body_parts_check(string_list_t **checklist, BODY *b)
{
- LIST *type;
+ string_list_t *type;
for (type = *checklist; type; type = type->next) {
ATTACH_MATCH *a = (ATTACH_MATCH *)type->data;
return 0;
}
-/* -------------------- XXX: MC READ MARK ------------- */
+static int count_body_parts (BODY *body, int flags)
+{
+ int count = 0;
+ BODY *bp;
-#define AT_COUNT(why) { shallcount = 1; }
-#define AT_NOCOUNT(why) { shallcount = 0; }
+ if (!body)
+ return 0;
-int count_body_parts (BODY *body, int flags) {
- int count = 0;
- int shallcount, shallrecurse;
- BODY *bp;
+ 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);
- if (body == NULL)
- return 0;
+ iscontainer = bp->type == TYPEMESSAGE || bp->type == TYPEMULTIPART;
- 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 (mime_which_token(bp->subtype, -1) == MIME_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 (mime_which_token(bp->subtype, -1) == MIME_ALTERNATIVE)
- shallrecurse = 0;
-
- /* Don't count containers if they're top-level. */
- if (flags & M_PARTS_TOPLEVEL)
- AT_NOCOUNT("top-level multipart");
- }
+ /* don't recurse in external bodies or multipart/alternatives */
+ shallrecurse = (bp->type == TYPEMESSAGE && tok != MIME_EXTERNAL_BODY)
+ || (bp->type == TYPEMULTIPART && tok != MIME_ALTERNATIVE);
- 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))
- AT_NOCOUNT("attach not allowed");
- if (count_body_parts_check(&AttachExclude, bp))
- AT_NOCOUNT("attach excluded");
- } else {
- if (!count_body_parts_check(&InlineAllow, bp))
- AT_NOCOUNT("inline not allowed");
- if (count_body_parts_check(&InlineExclude, bp))
- AT_NOCOUNT("excluded");
- }
- }
+ /* 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;
}