#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 "charset.h"
#include "mime.h"
/* Reads an arbitrarily long header field, and looks ahead for continuation
}
/* 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);
}
}
if (!*p)
continue;
} else {
- debug_print (1, ("bogus MIME header: %s\n", line));
break;
}
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
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++;
- }
- }
}
break;
}
}
if (count < 4) { /* don't check for missing timezone */
- debug_print (1, ("error parsing date format, using received time\n"));
return -1;
}
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);
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;
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;
}
}
}
/* 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;
projects / apps / madmutt.git / blobdiff