/*
* 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
#define BUFFSIZE 8192
+typedef char *(*getlinefunc)(char *, int, void *);
+typedef int (*peekcharfunc)(void *);
+typedef gint (*get_one_field_func)(gchar *, gint, void *, HeaderEntry[]);
+
+static gint string_get_one_field(gchar *buf, gint len, char **str,
+ HeaderEntry hentry[]);
+
+static char *string_getline(char *buf, int len, char **str);
+static int string_peekchar(char **str);
+static int fpeekchar(FILE *fp);
+static gint generic_get_one_field(gchar *buf, gint len, void *data,
+ HeaderEntry hentry[],
+ getlinefunc getline, peekcharfunc peekchar);
+static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags,
+ gboolean full, gboolean decrypted);
+
+
gint procheader_get_one_field(gchar *buf, gint len, FILE *fp,
HeaderEntry hentry[])
+{
+ return generic_get_one_field(buf, len, fp, hentry,
+ (getlinefunc)fgets, (peekcharfunc)fpeekchar);
+}
+
+static gint string_get_one_field(gchar *buf, gint len, char **str,
+ HeaderEntry hentry[])
+{
+ return generic_get_one_field(buf, len, str, hentry,
+ (getlinefunc)string_getline,
+ (peekcharfunc)string_peekchar);
+}
+
+static char *string_getline(char *buf, int len, char **str)
+{
+ if (!**str)
+ return NULL;
+
+ for (; **str && len > 1; --len)
+ if ((*buf++ = *(*str)++) == '\n')
+ break;
+ *buf = '\0';
+
+ return buf;
+}
+
+static int string_peekchar(char **str)
+{
+ return **str;
+}
+
+static int fpeekchar(FILE *fp)
+{
+ return ungetc(getc(fp), fp);
+}
+
+static gint generic_get_one_field(gchar *buf, gint len, void *data,
+ HeaderEntry *hentry,
+ getlinefunc getline, peekcharfunc peekchar)
{
gint nexthead;
gint hnum = 0;
/* skip non-required headers */
do {
do {
- if (fgets(buf, len, fp) == NULL)
+ if (getline(buf, len, data) == NULL)
return -1;
if (buf[0] == '\r' || buf[0] == '\n')
return -1;
}
} while (hp->name == NULL);
} else {
- if (fgets(buf, len, fp) == NULL) return -1;
+ if (getline(buf, len, data) == NULL) return -1;
if (buf[0] == '\r' || buf[0] == '\n') return -1;
}
- /* unfold the specified folded line */
- if (hp && hp->unfold) {
- 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);
-
- /* folded */
- if (nexthead == ' ' || nexthead == '\t')
- folded = TRUE;
- else if (nexthead == EOF)
- break;
- else if (folded == TRUE) {
- if (nexthead == '\r' || nexthead == '\n') {
- folded = FALSE;
- continue;
- }
-
- if ((len - (bufp - buf)) <= 2) break;
-
- /* replace return code on the tail end
- with space */
- *bufp++ = ' ';
- *bufp++ = nexthead;
- *bufp = '\0';
- /* 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);
- break;
- }
- }
-
- return hnum;
- }
+ /* remove trailing new line */
+ strretchomp(buf);
+ /* unfold line */
while (1) {
- nexthead = fgetc(fp);
+ nexthead = peekchar(data);
if (nexthead == ' ' || nexthead == '\t') {
size_t buflen = strlen(buf);
/* concatenate next line */
if ((len - buflen) > 2) {
- gchar *p = buf + buflen;
-
- *p++ = nexthead;
- *p = '\0';
- buflen++;
- if (fgets(p, len - buflen, fp) == NULL)
+ if (getline(buf + buflen, len - buflen, data) == NULL)
break;
+ /* trim trailing \n if requesting one header or
+ * unfolding was requested */
+ if (!hentry || (hp && hp->unfold))
+ strretchomp(buf);
} else
break;
- } else {
- if (nexthead != EOF)
- ungetc(nexthead, fp);
+ } else
break;
- }
}
- /* remove trailing return code */
- strretchomp(buf);
-
return hnum;
}
+#if 0
gchar *procheader_get_unfolded_line(gchar *buf, gint len, FILE *fp)
{
gboolean folded = FALSE;
return buf;
}
+#endif
+#if 0
GSList *procheader_get_header_list_from_file(const gchar *file)
{
FILE *fp;
return hlist;
}
+#endif
+#if 0
GPtrArray *procheader_get_header_array(FILE *fp)
{
gchar buf[BUFFSIZE];
return headers;
}
+#endif
GPtrArray *procheader_get_header_array_asis(FILE *fp)
{
return headers;
}
+#if 0
void procheader_header_list_destroy(GSList *hlist)
{
Header *header;
hlist = g_slist_remove(hlist, header);
}
}
+#endif
void procheader_header_array_destroy(GPtrArray *harray)
{
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;
}
}
MsgInfo *procheader_parse_str(const gchar *str, MsgFlags flags, gboolean full,
gboolean decrypted)
{
- FILE *fp;
- MsgInfo *msginfo;
-
- if ((fp = str_open_as_stream(str)) == NULL)
- return NULL;
-
- msginfo = procheader_parse_stream(fp, flags, full, decrypted);
- fclose(fp);
- return msginfo;
+ return parse_stream(&str, TRUE, flags, full, decrypted);
}
enum
H_RETURN_RECEIPT_TO = 16
};
-MsgInfo *procheader_parse_stream(FILE *fp, MsgFlags flags, gboolean full,
+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}};
+ return parse_stream(fp, FALSE, flags, full, decrypted);
+}
+static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags,
+ gboolean full, gboolean decrypted)
+{
MsgInfo *msginfo;
gchar buf[BUFFSIZE], tmp[BUFFSIZE];
gchar *reference = NULL;
gchar *hp;
HeaderEntry *hentry;
gint hnum;
+ get_one_field_func get_one_field =
+ isstring ? (get_one_field_func)string_get_one_field
+ : (get_one_field_func)procheader_get_one_field;
- hentry = full ? hentry_full : hentry_short;
+ hentry = procheader_get_headernames(full);
- if (MSG_IS_QUEUED(flags)) {
- while (fgets(buf, sizeof(buf), fp) != NULL)
- if (buf[0] == '\r' || buf[0] == '\n') break;
+ if (MSG_IS_QUEUED(flags) || MSG_IS_DRAFT(flags)) {
+ while (get_one_field(buf, sizeof(buf), data, NULL) != -1)
+ ; /* loop */
}
msginfo = procmsg_msginfo_new();
msginfo->inreplyto = NULL;
- while ((hnum = procheader_get_one_field(buf, sizeof(buf), fp, hentry))
+ while ((hnum = get_one_field(buf, sizeof(buf), data, hentry))
!= -1) {
hp = buf + strlen(hentry[hnum].name);
while (*hp == ' ' || *hp == '\t') hp++;
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)
+/* Added by Mel Hadasht on 27 Aug 2001 */
+/* Get a header from msginfo */
+gint procheader_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