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);
GSList *procheader_get_header_list(FILE *fp)
{
- gchar buf[BUFFSIZE], tmp[BUFFSIZE];
- gchar *p;
+ gchar buf[BUFFSIZE];
GSList *hlist = NULL;
Header *header;
g_return_val_if_fail(fp != NULL, NULL);
while (procheader_get_unfolded_line(buf, sizeof(buf), fp) != NULL) {
- if (header = procheader_parse_header(buf))
+ if ((header = procheader_parse_header(buf)) != NULL)
hlist = g_slist_append(hlist, header);
/*
if (*buf == ':') continue;
GPtrArray *procheader_get_header_array(FILE *fp)
{
- gchar buf[BUFFSIZE], tmp[BUFFSIZE];
- gchar *p;
+ gchar buf[BUFFSIZE];
GPtrArray *headers;
Header *header;
headers = g_ptr_array_new();
while (procheader_get_unfolded_line(buf, sizeof(buf), fp) != NULL) {
- if (header = procheader_parse_header(buf))
+ if ((header = procheader_parse_header(buf)) != NULL)
g_ptr_array_add(headers, header);
/*
if (*buf == ':') continue;
GPtrArray *procheader_get_header_array_asis(FILE *fp)
{
- gchar buf[BUFFSIZE], tmp[BUFFSIZE];
- gchar *p;
+ gchar buf[BUFFSIZE];
GPtrArray *headers;
Header *header;
headers = g_ptr_array_new();
while (procheader_get_one_field(buf, sizeof(buf), fp, NULL) != -1) {
- if (header = procheader_parse_header(buf))
+ if ((header = procheader_parse_header(buf)) != NULL)
g_ptr_array_add(headers, header);
/*
if (*buf == ':') continue;
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_file(const gchar *file, MsgFlags flags,
+ gboolean full, gboolean decrypted)
+{
+ FILE *fp;
+ MsgInfo *msginfo;
+
+ if ((fp = fopen(file, "rb")) == NULL) {
+ FILE_OP_ERROR(file, "fopen");
+ return NULL;
+ }
+
+ msginfo = procheader_parse_stream(fp, flags, full, decrypted);
+ fclose(fp);
+ return msginfo;
+}
+
+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;
+}
+
enum
{
H_DATE = 0,
H_RETURN_RECEIPT_TO = 16
};
-MsgInfo *procheader_parse(const gchar *file, MsgFlags flags,
- gboolean full, gboolean decrypted)
-{
- FILE *fp;
- MsgInfo *msginfo;
-
- if ((fp = fopen(file, "rb")) == NULL) {
- FILE_OP_ERROR(file, "fopen");
- return NULL;
- }
-
- msginfo = procheader_file_parse(fp, flags, full, decrypted);
-
- fclose(fp);
-
- return msginfo;
-}
-
-
-/* FIXME: we should not allow headers in messages to change the sylpheed marks
- * so we're currently disabling setting any MsgFlags when detecting X-Seen,
- * Seen, X-Status, Status. See macro ALLOW_HEADER_HINT */
-
-/* #define ALLOW_HEADER_HINT */
-
-MsgInfo *procheader_file_parse(FILE * fp, MsgFlags flags,
- gboolean full, gboolean decrypted)
+MsgInfo *procheader_parse_stream(FILE *fp, MsgFlags flags, gboolean full,
+ gboolean decrypted)
{
static HeaderEntry hentry_full[] = {{"Date:", NULL, FALSE},
{"From:", NULL, TRUE},
{"X-Status:", NULL, FALSE},
{"From ", NULL, FALSE},
{NULL, NULL, FALSE}};
-
+
MsgInfo *msginfo;
gchar buf[BUFFSIZE], tmp[BUFFSIZE];
gchar *reference = NULL;
hentry = full ? hentry_full : hentry_short;
- 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;
}
- msginfo = g_new0(MsgInfo, 1);
+ msginfo = procmsg_msginfo_new();
if (flags.tmp_flags || flags.perm_flags)
msginfo->flags = flags;
while ((hnum = procheader_get_one_field(buf, sizeof(buf), fp, hentry))
!= -1) {
hp = buf + strlen(hentry[hnum].name);
-
while (*hp == ' ' || *hp == '\t') hp++;
switch (hnum) {
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;
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;
gint hh, mm, ss;
GDateMonth dmonth;
gchar *p;
- time_t timer;
if (!t)
return FALSE;
t->tm_yday = 0;
t->tm_isdst = -1;
+ mktime(t);
+
return TRUE;
}
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}};
- gint val;
- g_return_if_fail(msginfo != NULL);
- file = procmsg_get_message_file_path(msginfo);
- if ((fp = fopen(file, "rb")) == NULL) {
+ gchar *file;
+ FILE *fp;
+ HeaderEntry hentry[]={ { header, NULL, TRUE },
+ { NULL, NULL, FALSE } };
+ gint val;
+
+ g_return_val_if_fail(msginfo != NULL, -1);
+ file = procmsg_get_message_file_path(msginfo);
+ if ((fp = fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
g_free(file);
- return;
- }
- val=procheader_get_one_field(buf,len, fp, hentry);
- if (fclose(fp) == EOF) {
+ return -1;
+ }
+ 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;
}
- if (val == -1)
- return -1;
- return 0;
+
+ g_free(file);
+ if (val == -1)
+ return -1;
+
+ return 0;
}
projects / claws.git / blobdiff