/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2014 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
MsgInfo *procheader_parse_file(const gchar *file, MsgFlags flags,
gboolean full, gboolean decrypted)
{
- struct stat s;
+ GStatBuf s;
FILE *fp;
MsgInfo *msginfo;
enum
{
- H_DATE = 0,
- H_FROM = 1,
- H_TO = 2,
- H_CC = 3,
- H_NEWSGROUPS = 4,
- H_SUBJECT = 5,
- H_MSG_ID = 6,
- H_REFERENCES = 7,
- H_IN_REPLY_TO = 8,
- H_CONTENT_TYPE = 9,
- H_SEEN = 10,
- H_STATUS = 11,
- H_X_STATUS = 12,
- H_FROM_SPACE = 13,
- H_SC_PLANNED_DOWNLOAD = 14,
- H_SC_MESSAGE_SIZE = 15,
- H_FACE = 16,
- H_X_FACE = 17,
- H_DISPOSITION_NOTIFICATION_TO = 18,
- H_RETURN_RECEIPT_TO = 19,
- H_SC_PARTIALLY_RETRIEVED = 20,
- H_SC_ACCOUNT_SERVER = 21,
- H_SC_ACCOUNT_LOGIN = 22,
- H_LIST_POST = 23,
- H_LIST_SUBSCRIBE = 24,
- H_LIST_UNSUBSCRIBE = 25,
- H_LIST_HELP = 26,
- H_LIST_ARCHIVE = 27,
- H_LIST_OWNER = 28,
+ H_DATE = 0,
+ H_FROM,
+ H_TO,
+ H_CC,
+ H_NEWSGROUPS,
+ H_SUBJECT,
+ H_MSG_ID,
+ H_REFERENCES,
+ H_IN_REPLY_TO,
+ H_CONTENT_TYPE,
+ H_SEEN,
+ H_STATUS,
+ H_FROM_SPACE,
+ H_SC_PLANNED_DOWNLOAD,
+ H_SC_MESSAGE_SIZE,
+ H_FACE,
+ H_X_FACE,
+ H_DISPOSITION_NOTIFICATION_TO,
+ H_RETURN_RECEIPT_TO,
+ H_SC_PARTIALLY_RETRIEVED,
+ H_SC_ACCOUNT_SERVER,
+ H_SC_ACCOUNT_LOGIN,
+ H_LIST_POST,
+ H_LIST_SUBSCRIBE,
+ H_LIST_UNSUBSCRIBE,
+ H_LIST_HELP,
+ H_LIST_ARCHIVE,
+ H_LIST_OWNER,
+ H_RESENT_FROM,
};
-static HeaderEntry hentry_full[] = {{"Date:", NULL, FALSE},
+static HeaderEntry hentry_full[] = {
+ {"Date:", NULL, FALSE},
{"From:", NULL, TRUE},
{"To:", NULL, TRUE},
{"Cc:", NULL, TRUE},
{"Content-Type:", NULL, FALSE},
{"Seen:", NULL, FALSE},
{"Status:", NULL, FALSE},
- {"X-Status:", NULL, FALSE},
{"From ", NULL, FALSE},
{"SC-Marked-For-Download:", NULL, FALSE},
{"SC-Message-Size:", NULL, FALSE},
{"List-Help:", NULL, TRUE},
{"List-Archive:", NULL, TRUE},
{"List-Owner:", NULL, TRUE},
+ {"Resent-From:", NULL, TRUE},
{NULL, NULL, FALSE}};
-static HeaderEntry hentry_short[] = {{"Date:", NULL, FALSE},
+static HeaderEntry hentry_short[] = {
+ {"Date:", NULL, FALSE},
{"From:", NULL, TRUE},
{"To:", NULL, TRUE},
{"Cc:", NULL, TRUE},
{"Content-Type:", NULL, FALSE},
{"Seen:", NULL, FALSE},
{"Status:", NULL, FALSE},
- {"X-Status:", NULL, FALSE},
{"From ", NULL, FALSE},
{"SC-Marked-For-Download:", NULL, FALSE},
{"SC-Message-Size:",NULL, FALSE},
return FALSE;
}
+static guint avatar_hook_id = 0;
+
static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags,
gboolean full, gboolean decrypted)
{
HeaderEntry *hentry;
gint hnum;
void *orig_data = data;
- guint hook_id = -1;
get_one_field_func get_one_field =
isstring ? (get_one_field_func)string_get_one_field
msginfo->inreplyto = NULL;
- if (prefs_common.enable_avatars | AVATARS_ENABLE_CAPTURE) {
- hook_id = hooks_register_hook(AVATAR_HEADER_UPDATE_HOOKLIST, avatar_from_some_face, NULL);
+ if (avatar_hook_id == 0 && (prefs_common.enable_avatars & AVATARS_ENABLE_CAPTURE)) {
+ avatar_hook_id = hooks_register_hook(AVATAR_HEADER_UPDATE_HOOKLIST, avatar_from_some_face, NULL);
+ } else if (avatar_hook_id != 0 && !(prefs_common.enable_avatars & AVATARS_ENABLE_CAPTURE)) {
+ hooks_unregister_hook(AVATAR_HEADER_UPDATE_HOOKLIST, avatar_hook_id);
+ avatar_hook_id = 0;
}
while ((hnum = get_one_field(buf, sizeof(buf), data, hentry))
if (!g_ascii_strncasecmp(hp, "multipart/", 10))
MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MULTIPART);
break;
-#ifdef ALLOW_HEADER_HINT
- case H_SEEN:
- /* mnews Seen header */
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW|MSG_UNREAD);
- break;
-#endif
case H_DISPOSITION_NOTIFICATION_TO:
if (!msginfo->extradata)
msginfo->extradata = g_new0(MsgInfoExtraData, 1);
msginfo->planned_download = atoi(hp);
break;
/* end partial download infos */
-#ifdef ALLOW_HEADER_HINT
- case H_STATUS:
- if (strchr(hp, 'R') != NULL)
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_UNREAD);
- if (strchr(hp, 'O') != NULL)
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW);
- if (strchr(hp, 'U') != NULL)
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_UNREAD);
- break;
- case H_X_STATUS:
- if (strchr(hp, 'D') != NULL)
- MSG_SET_PERM_FLAGS(msginfo->flags,
- MSG_REALLY_DELETED);
- if (strchr(hp, 'F') != NULL)
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
- if (strchr(hp, 'd') != NULL)
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
- if (strchr(hp, 'r') != NULL)
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_REPLIED);
- if (strchr(hp, 'f') != NULL)
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
- break;
-#endif
case H_FROM_SPACE:
if (msginfo->fromspace) break;
msginfo->fromspace = g_strdup(hp);
if (msginfo->extradata->list_owner) break;
msginfo->extradata->list_owner = g_strdup(hp);
break;
+ case H_RESENT_FROM:
+ if (!msginfo->extradata)
+ msginfo->extradata = g_new0(MsgInfoExtraData, 1);
+ if (msginfo->extradata->resent_from) break;
+ msginfo->extradata->resent_from = g_strdup(hp);
+ break;
/* end list infos */
default:
break;
msginfo->inreplyto =
g_strdup((gchar *)msginfo->references->data);
- if (hook_id != -1) {
- hooks_unregister_hook(AVATAR_HEADER_UPDATE_HOOKLIST, hook_id);
- }
-
return msginfo;
}
{
gint result;
gint month_n;
- gchar zone1[3];
- gchar zone2[3];
+ gint secfract;
+ gint zone1 = 0, zone2 = 0;
+ gchar offset_sign, zonestr[7];
+ gchar sep1;
if (str == NULL)
return -1;
- result = sscanf(str, "%10s %d %9s %d %2d:%2d:%2d %5s",
+ result = sscanf(str, "%10s %d %9s %d %2d:%2d:%2d %6s",
weekday, day, month, year, hh, mm, ss, zone);
if (result == 8) return 0;
/* RFC2822 */
- result = sscanf(str, "%3s,%d %9s %d %2d:%2d:%2d %5s",
+ result = sscanf(str, "%3s,%d %9s %d %2d:%2d:%2d %6s",
weekday, day, month, year, hh, mm, ss, zone);
if (result == 8) return 0;
- result = sscanf(str, "%d %9s %d %2d:%2d:%2d %5s",
+ result = sscanf(str, "%d %9s %d %2d:%2d:%2d %6s",
day, month, year, hh, mm, ss, zone);
if (result == 7) return 0;
if (result == 6) return 0;
*ss = 0;
- result = sscanf(str, "%10s %d %9s %d %2d:%2d %5s",
+ result = sscanf(str, "%10s %d %9s %d %2d:%2d %6s",
weekday, day, month, year, hh, mm, zone);
if (result == 7) return 0;
day, month, year, hh, mm);
if (result == 5) return 0;
- /* RFC3339 subset */
*weekday = '\0';
- result = sscanf(str, "%4d-%2d-%2d %2d:%2d:%2d+%2s:%2s",
- year, &month_n, day, hh, mm, ss, zone1, zone2);
- if (result == 8) {
- if (1 <= month_n && month_n <= 12) {
+
+ /* RFC3339 subset, with fraction of second */
+ result = sscanf(str, "%4d-%2d-%2d%c%2d:%2d:%2d.%d%6s",
+ year, &month_n, day, &sep1, hh, mm, ss, &secfract, zonestr);
+ if (result == 9
+ && (sep1 == 'T' || sep1 == 't' || sep1 == ' ')) {
+ if (month_n >= 1 && month_n <= 12) {
strncpy2(month, monthstr+((month_n-1)*3), 4);
- *zone = '+';
- strncpy2(zone+1, zone1, 3);
- strncpy2(zone+3, zone2, 3);
+ if (zonestr[0] == 'z' || zonestr[0] == 'Z') {
+ strcat(zone, "+00:00");
+ } else if (sscanf(zonestr, "%c%2d:%2d",
+ &offset_sign, &zone1, &zone2) == 3) {
+ strcat(zone, zonestr);
+ }
+ return 0;
+ }
+ }
+
+ /* RFC3339 subset, no fraction of second */
+ result = sscanf(str, "%4d-%2d-%2d%c%2d:%2d:%2d%6s",
+ year, &month_n, day, &sep1, hh, mm, ss, zonestr);
+ if (result == 8
+ && (sep1 == 'T' || sep1 == 't' || sep1 == ' ')) {
+ if (month_n >= 1 && month_n <= 12) {
+ strncpy2(month, monthstr+((month_n-1)*3), 4);
+ if (zonestr[0] == 'z' || zonestr[0] == 'Z') {
+ strcat(zone, "+00:00");
+ } else if (sscanf(zonestr, "%c%2d:%2d",
+ &offset_sign, &zone1, &zone2) == 3) {
+ strcat(zone, zonestr);
+ }
return 0;
}
}
- /* RFC3339 subset */
*zone = '\0';
- *weekday = '\0';
+
+ /* RFC3339 subset */
+ /* This particular "subset" is invalid, RFC requires the time offset */
result = sscanf(str, "%4d-%2d-%2d %2d:%2d:%2d",
year, &month_n, day, hh, mm, ss);
if (result == 6) {
if (procheader_scan_date_string(src, weekday, &day, month, &year,
&hh, &mm, &ss, zone) < 0) {
- g_warning("Invalid date: %s\n", src);
+ g_warning("Invalid date: %s", src);
return FALSE;
}
if ((p = strstr(monthstr, month)) != NULL)
dmonth = (gint)(p - monthstr) / 3 + 1;
else {
- g_warning("Invalid month: %s\n", month);
+ g_warning("Invalid month: %s", month);
dmonth = G_DATE_BAD_MONTH;
}
gchar month[10];
gint year;
gint hh, mm, ss;
- gchar zone[6];
+ gchar zone[7];
GDateMonth dmonth = G_DATE_BAD_MONTH;
- struct tm t;
gchar *p;
time_t timer;
- time_t tz_offset;
if (procheader_scan_date_string(src, weekday, &day, month, &year,
&hh, &mm, &ss, zone) < 0) {
return 0;
}
- /* Y2K compliant :) */
- if (year < 1000) {
- if (year < 50)
- year += 2000;
- else
- year += 1900;
- }
-
month[3] = '\0';
for (p = monthstr; *p != '\0'; p += 3) {
if (!g_ascii_strncasecmp(p, month, 3)) {
}
}
+#ifdef G_OS_WIN32
+ GTimeZone *tz;
+ GDateTime *dt;
+
+ tz = g_time_zone_new(zone);
+ dt = g_date_time_new(tz, year, dmonth, day, hh, mm, ss);
+
+ timer = g_date_time_to_unix(dt);
+
+ g_date_time_unref(dt);
+ g_time_zone_unref(tz);
+
+#else
+ struct tm t;
+ time_t tz_offset;
+
+ /* Y2K compliant :) */
+ if (year < 1000) {
+ if (year < 50)
+ year += 2000;
+ else
+ year += 1900;
+ }
+
t.tm_sec = ss;
t.tm_min = mm;
t.tm_hour = hh;
if (dest)
procheader_date_get_localtime(dest, len, timer);
+#endif
return timer;
}
}
}
+gboolean procheader_header_is_internal(const gchar *hdr_name)
+{
+ const gchar *internal_hdrs[] = {
+ "AF:", "NF:", "PS:", "SRH:", "SFN:", "DSR:", "MID:", "CFG:",
+ "PT:", "S:", "RQ:", "SSV:", "NSV:", "SSH:", "R:", "MAID:",
+ "SCF:", "RMID:", "FMID:", "NAID:",
+ "X-Claws-Account-Id:",
+ "X-Claws-Sign:",
+ "X-Claws-Encrypt:",
+ "X-Claws-Privacy-System:",
+ "X-Claws-Auto-Wrapping:",
+ "X-Claws-Auto-Indent:",
+ "X-Claws-End-Special-Headers:",
+ "X-Sylpheed-Account-Id:",
+ "X-Sylpheed-Sign:",
+ "X-Sylpheed-Encrypt:",
+ "X-Sylpheed-Privacy-System:",
+ "X-Sylpheed-End-Special-Headers:",
+ NULL
+ };
+ int i;
+
+ for (i = 0; internal_hdrs[i]; i++) {
+ if (!strcmp(hdr_name, internal_hdrs[i]))
+ return TRUE;
+ }
+ return FALSE;
+}