#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;
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 (hdr->attach_valid && !(flags & M_PARTS_RECOUNT))
+ 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;
+ 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;
+ hdr->attach_valid = 1;
+ return hdr->attach_total;
}