/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
*
* 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
for (hp = hentry, hnum = 0; hp->name != NULL;
hp++, hnum++) {
if (!strncasecmp(hp->name, buf,
- strlen(hp->name))) {
+ strlen(hp->name)))
break;
- }
}
} while (hp->name == NULL);
} else {
gboolean folded = FALSE;
gchar *bufp = buf + strlen(buf);
+ for (; bufp > buf &&
+ (*(bufp - 1) == '\n' || *(bufp - 1) == '\r');
+ bufp--)
+ *(bufp - 1) = '\0';
+
while (1) {
nexthead = fgetc(fp);
else if (nexthead == EOF)
break;
else if (folded == TRUE) {
- /* concatenate next line */
+ if (nexthead == '\r' || nexthead == '\n') {
+ folded = FALSE;
+ continue;
+ }
+
if ((len - (bufp - buf)) <= 2) break;
/* replace return code on the tail end
with space */
- *(bufp - 1) = ' ';
+ *bufp++ = ' ';
*bufp++ = nexthead;
*bufp = '\0';
- if (nexthead == '\r' || nexthead == '\n') {
- folded = FALSE;
- continue;
- }
+ /* concatenate next line */
if (fgets(bufp, len - (bufp - buf), fp)
== NULL) break;
bufp += strlen(bufp);
+ for (; bufp > buf &&
+ (*(bufp - 1) == '\n' || *(bufp - 1) == '\r');
+ bufp--)
+ *(bufp - 1) = '\0';
+
folded = FALSE;
} else {
ungetc(nexthead, fp);
}
}
- /* remove trailing return code */
- strretchomp(buf);
-
return hnum;
}
if (buf[0] == '\r' || buf[0] == '\n') return NULL;
bufp = buf + strlen(buf);
+ for (; bufp > buf &&
+ (*(bufp - 1) == '\n' || *(bufp - 1) == '\r');
+ bufp--)
+ *(bufp - 1) = '\0';
+
while (1) {
nexthead = fgetc(fp);
else if (nexthead == EOF)
break;
else if (folded == TRUE) {
- /* concatenate next line */
+ if (nexthead == '\r' || nexthead == '\n') {
+ folded = FALSE;
+ continue;
+ }
+
if ((len - (bufp - buf)) <= 2) break;
/* replace return code on the tail end
with space */
- *(bufp - 1) = ' ';
+ *bufp++ = ' ';
*bufp++ = nexthead;
*bufp = '\0';
- if (nexthead == '\r' || nexthead == '\n') {
- folded = FALSE;
- continue;
- }
+
+ /* concatenate next line */
if (fgets(bufp, len - (bufp - buf), fp)
== NULL) break;
bufp += strlen(bufp);
+ for (; bufp > buf &&
+ (*(bufp - 1) == '\n' || *(bufp - 1) == '\r');
+ bufp--)
+ *(bufp - 1) = '\0';
+
folded = FALSE;
} else {
ungetc(nexthead, fp);
p++;
while (*p == ' ' || *p == '\t') p++;
conv_unmime_header(tmp, sizeof(tmp), p, NULL);
- header->body = g_strdup(tmp);
+ if(tmp == NULL)
+ header->body = g_strdup(p);
+ else
+ header->body = g_strdup(tmp);
return header;
}
}
H_RETURN_RECEIPT_TO = 16
};
+static HeaderEntry hentry_full[] = {{"Date:", NULL, FALSE},
+ {"From:", NULL, TRUE},
+ {"To:", NULL, TRUE},
+ {"Cc:", NULL, TRUE},
+ {"Newsgroups:", NULL, TRUE},
+ {"Subject:", NULL, TRUE},
+ {"Message-Id:", NULL, FALSE},
+ {"References:", NULL, FALSE},
+ {"In-Reply-To:", NULL, FALSE},
+ {"Content-Type:", NULL, FALSE},
+ {"Seen:", NULL, FALSE},
+ {"Status:", NULL, FALSE},
+ {"X-Status:", NULL, FALSE},
+ {"From ", NULL, FALSE},
+ {"X-Face:", NULL, FALSE},
+ {"Disposition-Notification-To:", NULL, FALSE},
+ {"Return-Receipt-To:", NULL, FALSE},
+ {NULL, NULL, FALSE}};
+
+static HeaderEntry hentry_short[] = {{"Date:", NULL, FALSE},
+ {"From:", NULL, TRUE},
+ {"To:", NULL, TRUE},
+ {"Cc:", NULL, TRUE},
+ {"Newsgroups:", NULL, TRUE},
+ {"Subject:", NULL, TRUE},
+ {"Message-Id:", NULL, FALSE},
+ {"References:", NULL, FALSE},
+ {"In-Reply-To:", NULL, FALSE},
+ {"Content-Type:", NULL, FALSE},
+ {"Seen:", NULL, FALSE},
+ {"Status:", NULL, FALSE},
+ {"X-Status:", NULL, FALSE},
+ {"From ", NULL, FALSE},
+ {NULL, NULL, FALSE}};
+
+HeaderEntry* procheader_get_headernames(gboolean full)
+{
+ return full ? hentry_full : hentry_short;
+}
+
MsgInfo *procheader_parse_stream(FILE *fp, MsgFlags flags, gboolean full,
gboolean decrypted)
{
- static HeaderEntry hentry_full[] = {{"Date:", NULL, FALSE},
- {"From:", NULL, TRUE},
- {"To:", NULL, TRUE},
- {"Cc:", NULL, TRUE},
- {"Newsgroups:", NULL, TRUE},
- {"Subject:", NULL, TRUE},
- {"Message-Id:", NULL, FALSE},
- {"References:", NULL, FALSE},
- {"In-Reply-To:", NULL, FALSE},
- {"Content-Type:", NULL, FALSE},
- {"Seen:", NULL, FALSE},
- {"Status:", NULL, FALSE},
- {"X-Status:", NULL, FALSE},
- {"From ", NULL, FALSE},
- {"X-Face:", NULL, FALSE},
- {"Disposition-Notification-To:", NULL, FALSE},
- {"Return-Receipt-To:", NULL, FALSE},
- {NULL, NULL, FALSE}};
-
- static HeaderEntry hentry_short[] = {{"Date:", NULL, FALSE},
- {"From:", NULL, TRUE},
- {"To:", NULL, TRUE},
- {"Cc:", NULL, TRUE},
- {"Newsgroups:", NULL, TRUE},
- {"Subject:", NULL, TRUE},
- {"Message-Id:", NULL, FALSE},
- {"References:", NULL, FALSE},
- {"In-Reply-To:", NULL, FALSE},
- {"Content-Type:", NULL, FALSE},
- {"Seen:", NULL, FALSE},
- {"Status:", NULL, FALSE},
- {"X-Status:", NULL, FALSE},
- {"From ", NULL, FALSE},
- {NULL, NULL, FALSE}};
-
MsgInfo *msginfo;
gchar buf[BUFFSIZE], tmp[BUFFSIZE];
gchar *reference = NULL;
HeaderEntry *hentry;
gint hnum;
- hentry = full ? hentry_full : hentry_short;
+ hentry = procheader_get_headernames(full);
- if (MSG_IS_QUEUED(flags)) {
+ if (MSG_IS_QUEUED(flags) || MSG_IS_DRAFT(flags)) {
while (fgets(buf, sizeof(buf), fp) != NULL)
if (buf[0] == '\r' || buf[0] == '\n') break;
}
g_strconcat(p, ",", hp, NULL);
g_free(p);
} else
- msginfo->newsgroups = g_strdup(buf + 12);
+ msginfo->newsgroups = g_strdup(hp);
break;
case H_SUBJECT:
if (msginfo->subject) break;
break;
case H_CONTENT_TYPE:
if (decrypted) {
- if (!strncasecmp(hp, "multipart", 9) &&
- strncasecmp(hp, "multipart/signed", 16)) {
- MSG_SET_TMP_FLAGS(msginfo->flags,
+ if (!strncasecmp(hp, "multipart", 9)) {
+ if (strncasecmp(hp, "multipart/signed", 16)) {
+ MSG_SET_TMP_FLAGS(msginfo->flags,
MSG_MIME);
+ } else {
+ MSG_SET_TMP_FLAGS(msginfo->flags,
+ MSG_SIGNED);
+ }
}
}
else if (!strncasecmp(hp, "multipart/encrypted", 19)) {
MSG_SET_TMP_FLAGS(msginfo->flags,
MSG_ENCRYPTED);
- }
+ }
+ else if (!strncasecmp(hp, "multipart", 9) &&
+ !strncasecmp(hp, "multipart/signed", 16)) {
+ MSG_SET_TMP_FLAGS(msginfo->flags, MSG_SIGNED);
+ }
else if (!strncasecmp(hp, "multipart", 9))
MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MIME);
break;
case H_DISPOSITION_NOTIFICATION_TO:
if (msginfo->dispositionnotificationto) break;
msginfo->dispositionnotificationto = g_strdup(hp);
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_RETRCPT_PENDING);
break;
case H_RETURN_RECEIPT_TO:
if (msginfo->returnreceiptto) break;
msginfo->returnreceiptto = g_strdup(hp);
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_RETRCPT_PENDING);
break;
#ifdef ALLOW_HEADER_HINT
case H_STATUS:
day, month, year, hh, mm, ss, zone);
if (result == 7) return 0;
+ *zone = '\0';
+ result = sscanf(str, "%10s %d %9s %d %2d:%2d:%2d",
+ weekday, day, month, year, hh, mm, ss);
+ if (result == 7) return 0;
+
*ss = 0;
result = sscanf(str, "%10s %d %9s %d %2d:%2d %5s",
weekday, day, month, year, hh, mm, zone);
gint year;
gint hh, mm, ss;
gchar zone[6];
- GDateMonth dmonth;
+ 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) {
}
/* Y2K compliant :) */
- if (year < 100) {
- if (year < 70)
+ if (year < 1000) {
+ if (year < 50)
year += 2000;
else
year += 1900;
}
month[3] = '\0';
- if ((p = strstr(monthstr, month)) != NULL)
- dmonth = (gint)(p - monthstr) / 3 + 1;
- else {
- g_warning("Invalid month: %s\n", month);
- dmonth = G_DATE_BAD_MONTH;
+ for (p = monthstr; *p != '\0'; p += 3) {
+ if (!strncasecmp(p, month, 3)) {
+ dmonth = (gint)(p - monthstr) / 3 + 1;
+ break;
+ }
}
+ if (*p == '\0')
+ g_warning("Invalid month: %s\n", month);
t.tm_sec = ss;
t.tm_min = mm;
t.tm_isdst = -1;
timer = mktime(&t);
- timer += tzoffset_sec(&timer) - remote_tzoffset_sec(zone);
+ tz_offset = remote_tzoffset_sec(zone);
+ if (tz_offset != -1)
+ timer += tzoffset_sec(&timer) - tz_offset;
if (dest)
procheader_date_get_localtime(dest, len, timer);
strftime(dest, len, default_format, lt);
}
-gint get_header_from_msginfo(MsgInfo *msginfo, gchar *buf, gint len,gchar *header)
+gint get_header_from_msginfo(MsgInfo *msginfo, gchar *buf, gint len, gchar *header)
{
gchar *file;
FILE *fp;
- HeaderEntry hentry[]={{header,NULL,TRUE},
- {NULL,NULL,FALSE}};
+ HeaderEntry hentry[]={ { header, NULL, TRUE },
+ { NULL, NULL, FALSE } };
gint val;
g_return_val_if_fail(msginfo != NULL, -1);
g_free(file);
return -1;
}
- val=procheader_get_one_field(buf,len, fp, hentry);
+ val = procheader_get_one_field(buf,len, fp, hentry);
if (fclose(fp) == EOF) {
FILE_OP_ERROR(file, "fclose");
unlink(file);
+ g_free(file);
return -1;
}
+
+ g_free(file);
if (val == -1)
return -1;
projects / claws.git / blobdiff