MimeInfo *mimeinfo = (MimeInfo *) node->data;
g_free(mimeinfo->encoding);
- g_free(mimeinfo->charset);
g_free(mimeinfo->name);
g_free(mimeinfo->content_disposition);
if(mimeinfo->tmpfile)
MimeInfo *procmime_mimeinfo_next(MimeInfo *mimeinfo)
{
- if (!mimeinfo) return NULL;
+ g_return_val_if_fail(mimeinfo != NULL, NULL);
+ g_return_val_if_fail(mimeinfo->node != NULL, NULL);
if (mimeinfo->node->children)
return (MimeInfo *) mimeinfo->node->children->data;
if (mimeinfo->node->next)
return (MimeInfo *) mimeinfo->node->next->data;
- for (mimeinfo = (MimeInfo *) mimeinfo->node->parent->data; mimeinfo != NULL;
- mimeinfo = (MimeInfo *) mimeinfo->node->parent->data) {
+ if (mimeinfo->node->parent == NULL)
+ return NULL;
+
+ while (mimeinfo->node->parent != NULL) {
+ mimeinfo = (MimeInfo *) mimeinfo->node->parent->data;
if (mimeinfo->node->next)
return (MimeInfo *) mimeinfo->node->next->data;
}
filename = procmsg_get_message_file(msginfo);
if(!filename)
return NULL;
- if (msginfo->folder->stype != F_QUEUE)
+ if (msginfo->folder->stype != F_QUEUE &&
+ msginfo->folder->stype != F_DRAFT)
mimeinfo = procmime_scan_file(filename);
else
mimeinfo = procmime_scan_queue_file(filename);
H_SUBJECT = 4
};
+const gchar *procmime_mimeinfo_get_parameter(MimeInfo *mimeinfo, const gchar *name)
+{
+ g_return_val_if_fail(mimeinfo != NULL, NULL);
+ g_return_val_if_fail(name != NULL, NULL);
+
+ return g_hash_table_lookup(mimeinfo->parameters, name);
+}
+
gboolean procmime_decode_content(MimeInfo *mimeinfo)
{
gchar buf[BUFFSIZE];
FILE *procmime_get_text_content(MimeInfo *mimeinfo)
{
FILE *tmpfp, *outfp;
- gchar *src_codeset;
+ const gchar *src_codeset;
gboolean conv_fail = FALSE;
gchar buf[BUFFSIZE];
gchar *str;
}
src_codeset = prefs_common.force_charset
- ? prefs_common.force_charset : mimeinfo->charset;
+ ? prefs_common.force_charset :
+ procmime_mimeinfo_get_parameter(mimeinfo, "charset");
renderer = NULL;
gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filename,
const gchar *str, gboolean case_sens)
{
- return FALSE;
-
-#if 0 /* FIXME */
FILE *infp, *outfp;
gchar buf[BUFFSIZE];
gchar *(* StrFindFunc) (const gchar *haystack, const gchar *needle);
g_return_val_if_fail(mimeinfo != NULL, FALSE);
- g_return_val_if_fail(mimeinfo->mime_type == MIME_TEXT ||
- mimeinfo->mime_type == MIME_TEXT_HTML ||
- mimeinfo->mime_type == MIME_TEXT_ENRICHED, FALSE);
+ g_return_val_if_fail(mimeinfo->type == MIMETYPE_TEXT, FALSE);
g_return_val_if_fail(str != NULL, FALSE);
- if ((infp = fopen(filename, "rb")) == NULL) {
- FILE_OP_ERROR(filename, "fopen");
- return FALSE;
- }
-
- outfp = procmime_get_text_content(mimeinfo, infp);
- fclose(infp);
+ outfp = procmime_get_text_content(mimeinfo);
if (!outfp)
return FALSE;
fclose(outfp);
return FALSE;
-#endif
}
gboolean procmime_find_string(MsgInfo *msginfo, const gchar *str,
gboolean case_sens)
{
- return FALSE;
-
-#if 0 /* FIXME */
MimeInfo *mimeinfo;
MimeInfo *partinfo;
gchar *filename;
for (partinfo = mimeinfo; partinfo != NULL;
partinfo = procmime_mimeinfo_next(partinfo)) {
- if (partinfo->mime_type == MIME_TEXT ||
- partinfo->mime_type == MIME_TEXT_HTML ||
- partinfo->mime_type == MIME_TEXT_ENRICHED) {
+ if (partinfo->type == MIMETYPE_TEXT) {
if (procmime_find_string_part
(partinfo, filename, str, case_sens) == TRUE) {
found = TRUE;
g_free(filename);
return found;
-#endif
}
gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
if ((mimeinfo->type == MIMETYPE_TEXT) && !g_strcasecmp(mimeinfo->subtype, "html"))
base = "mimetmp.html";
else {
- base = mimeinfo->filename ? mimeinfo->filename
- : mimeinfo->name ? mimeinfo->name : "mimetmp";
+ base = mimeinfo->name ? mimeinfo->name : "mimetmp";
base = g_basename(base);
if (*base == '\0') base = "mimetmp";
Xstrdup_a(base, base, return NULL);
gchar *content_encoding,
gchar *content_description,
gchar *content_id,
- FILE *fp,
const gchar *filename,
guint offset,
guint length);
-void procmime_parse_message_rfc822(MimeInfo *mimeinfo, FILE *fp)
+void procmime_parse_message_rfc822(MimeInfo *mimeinfo)
{
HeaderEntry hentry[] = {{"Content-Type:", NULL, TRUE},
{"Content-Transfer-Encoding:",
NULL, TRUE},
{NULL, NULL, FALSE}};
guint content_start, i;
+ FILE *fp;
+ if(mimeinfo->encoding_type != ENC_BINARY &&
+ mimeinfo->encoding_type != ENC_7BIT &&
+ mimeinfo->encoding_type != ENC_8BIT)
+ procmime_decode_content(mimeinfo);
+
+ fp = fopen(mimeinfo->filename, "rb");
fseek(fp, mimeinfo->offset, SEEK_SET);
procheader_get_header_fields(fp, hentry);
content_start = ftell(fp);
+ fclose(fp);
procmime_parse_mimepart(mimeinfo,
hentry[0].body, hentry[1].body,
hentry[2].body, hentry[3].body,
- fp, mimeinfo->filename, content_start,
+ mimeinfo->filename, content_start,
mimeinfo->length - (content_start - mimeinfo->offset));
for (i = 0; i < 4; i++) {
g_free(hentry[i].body);
}
}
-void procmime_parse_multipart(MimeInfo *mimeinfo, FILE *fp)
+void procmime_parse_multipart(MimeInfo *mimeinfo)
{
HeaderEntry hentry[] = {{"Content-Type:", NULL, TRUE},
{"Content-Transfer-Encoding:",
gchar *boundary;
gint boundary_len = 0, lastoffset = -1, i;
gchar buf[BUFFSIZE];
+ FILE *fp;
boundary = g_hash_table_lookup(mimeinfo->parameters, "boundary");
- if(!boundary)
+ if (!boundary)
return;
boundary_len = strlen(boundary);
+ if (mimeinfo->encoding_type != ENC_BINARY &&
+ mimeinfo->encoding_type != ENC_7BIT &&
+ mimeinfo->encoding_type != ENC_8BIT)
+ procmime_decode_content(mimeinfo);
+
+ fp = fopen(mimeinfo->filename, "rb");
fseek(fp, mimeinfo->offset, SEEK_SET);
while ((p = fgets(buf, sizeof(buf), fp)) != NULL) {
if (ftell(fp) > (mimeinfo->offset + mimeinfo->length))
break;
if (IS_BOUNDARY(buf, boundary, boundary_len)) {
- if(lastoffset != -1) {
+ if (lastoffset != -1) {
procmime_parse_mimepart(mimeinfo,
hentry[0].body, hentry[1].body,
hentry[2].body, hentry[3].body,
- fp, mimeinfo->filename, lastoffset,
+ mimeinfo->filename, lastoffset,
(ftell(fp) - strlen(buf)) - lastoffset);
}
lastoffset = ftell(fp);
}
}
+ for (i = 0; i < 4; i++) {
+ g_free(hentry[i].body);
+ hentry[i].body = NULL;
+ }
+ fclose(fp);
}
static void procmime_parse_content_type(const gchar *content_type, MimeInfo *mimeinfo)
gchar *content_encoding,
gchar *content_description,
gchar *content_id,
- FILE *fp,
const gchar *filename,
guint offset,
guint length)
{
MimeInfo *mimeinfo;
- guint oldpos;
-
- g_return_if_fail(fp != NULL);
/* Create MimeInfo */
mimeinfo = procmime_mimeinfo_new();
else
mimeinfo->id = NULL;
- oldpos = ftell(fp);
/* Call parser for mime type */
switch (mimeinfo->type) {
case MIMETYPE_MESSAGE:
if (g_strcasecmp(mimeinfo->subtype, "rfc822") == 0) {
- procmime_parse_message_rfc822(mimeinfo, fp);
+ procmime_parse_message_rfc822(mimeinfo);
}
break;
case MIMETYPE_MULTIPART:
- procmime_parse_multipart(mimeinfo, fp);
+ procmime_parse_multipart(mimeinfo);
break;
default:
break;
}
- fseek(fp, oldpos, SEEK_SET);
}
static gchar *typenames[] = {
g_node_traverse(mimeinfo->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, output_func, NULL);
}
-MimeInfo *procmime_scan_fp(FILE *fp, const gchar *filename)
+static MimeInfo *procmime_scan_file_with_offset(const gchar *filename, int offset)
{
MimeInfo *mimeinfo;
- gint offset;
- struct stat stat;
+ struct stat buf;
- fstat(fileno(fp), &stat);
- offset = ftell(fp);
+ stat(filename, &buf);
mimeinfo = procmime_mimeinfo_new();
+ mimeinfo->encoding_type = ENC_BINARY;
mimeinfo->type = MIMETYPE_MESSAGE;
mimeinfo->subtype = g_strdup("rfc822");
mimeinfo->filename = g_strdup(filename);
mimeinfo->offset = offset;
- mimeinfo->length = stat.st_size - offset;
+ mimeinfo->length = buf.st_size - offset;
- procmime_parse_message_rfc822(mimeinfo, fp);
+ procmime_parse_message_rfc822(mimeinfo);
output_mime_structure(mimeinfo, 0);
return mimeinfo;
MimeInfo *procmime_scan_file(gchar *filename)
{
- FILE *fp;
MimeInfo *mimeinfo;
g_return_val_if_fail(filename != NULL, NULL);
- /* Open file */
- if((fp = fopen(filename, "rb")) == NULL)
- return NULL;
-
- mimeinfo = procmime_scan_fp(fp, filename);
-
- fclose(fp);
+ mimeinfo = procmime_scan_file_with_offset(filename, 0);
return mimeinfo;
}
FILE *fp;
MimeInfo *mimeinfo;
gchar buf[BUFFSIZE];
+ gint offset = 0;
g_return_val_if_fail(filename != NULL, NULL);
/* Open file */
if((fp = fopen(filename, "rb")) == NULL)
return NULL;
-
/* Skip queue header */
while (fgets(buf, sizeof(buf), fp) != NULL)
if (buf[0] == '\r' || buf[0] == '\n') break;
-
- mimeinfo = procmime_scan_fp(fp, filename);
-
+ offset = ftell(fp);
fclose(fp);
+ mimeinfo = procmime_scan_file_with_offset(filename, offset);
+
return mimeinfo;
}
projects / claws.git / blobdiff