mimeinfo->parameters = g_hash_table_new(g_str_hash, g_str_equal);
mimeinfo->node = g_node_new(mimeinfo);
-
+
return mimeinfo;
}
g_free(mimeinfo->encoding);
g_free(mimeinfo->name);
- g_free(mimeinfo->content_disposition);
if(mimeinfo->tmpfile)
unlink(mimeinfo->filename);
g_free(mimeinfo->filename);
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);
gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filename,
const gchar *str, gboolean case_sens)
{
- return FALSE;
-
-#if 0 /* FIXME */
- FILE *infp, *outfp;
+ FILE *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,
+ gchar *content_disposition,
const gchar *filename,
guint offset,
guint length);
NULL, TRUE},
{"Content-ID:",
NULL, TRUE},
+ {"Content-Disposition:",
+ NULL, TRUE},
{NULL, NULL, FALSE}};
guint content_start, i;
FILE *fp;
procmime_parse_mimepart(mimeinfo,
hentry[0].body, hentry[1].body,
hentry[2].body, hentry[3].body,
+ hentry[4].body,
mimeinfo->filename, content_start,
mimeinfo->length - (content_start - mimeinfo->offset));
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < (sizeof hentry / sizeof hentry[0]); i++) {
g_free(hentry[i].body);
hentry[i].body = NULL;
}
NULL, TRUE},
{"Content-ID:",
NULL, TRUE},
+ {"Content-Disposition:",
+ NULL, TRUE},
{NULL, NULL, FALSE}};
gchar *p;
gchar *boundary;
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)
+ 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");
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,
+ hentry[4].body,
mimeinfo->filename, lastoffset,
(ftell(fp) - strlen(buf)) - lastoffset);
}
buf[2 + boundary_len + 1] == '-')
break;
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < (sizeof hentry / sizeof hentry[0]) ; i++) {
g_free(hentry[i].body);
hentry[i].body = NULL;
}
lastoffset = ftell(fp);
}
}
+ for (i = 0; i < (sizeof hentry / sizeof hentry[0]); i++) {
+ g_free(hentry[i].body);
+ hentry[i].body = NULL;
+ }
fclose(fp);
}
+static void add_to_mimeinfo_parameters(gchar **parts, MimeInfo *mimeinfo)
+{
+ gchar **strarray;
+
+ for (strarray = parts; *strarray != NULL; strarray++) {
+ gchar **parameters_parts;
+
+ parameters_parts = g_strsplit(*strarray, "=", 1);
+ if ((parameters_parts[0] != NULL) && (parameters_parts[1] != NULL)) {
+ gchar *firstspace;
+
+ g_strstrip(parameters_parts[0]);
+ g_strstrip(parameters_parts[1]);
+ g_strdown(parameters_parts[0]);
+ if(parameters_parts[1][0] == '"')
+ extract_quote(parameters_parts[1], '"');
+ else if ((firstspace = strchr(parameters_parts[1], ' ')) != NULL)
+ *firstspace = '\0';
+ if(g_hash_table_lookup(mimeinfo->parameters,
+ parameters_parts[0]) == NULL)
+ g_hash_table_insert(mimeinfo->parameters,
+ g_strdup(parameters_parts[0]),
+ g_strdup(parameters_parts[1]));
+ }
+ g_strfreev(parameters_parts);
+ }
+}
+
static void procmime_parse_content_type(const gchar *content_type, MimeInfo *mimeinfo)
{
gchar **content_type_parts;
gchar *str;
struct TypeTable *typetablearray;
+ g_return_if_fail(content_type != NULL);
+ g_return_if_fail(mimeinfo != NULL);
+
/* Split content type into parts and remove trailing
and leading whitespaces from all strings */
content_type_parts = g_strsplit(content_type, ";", 0);
/* Get mimeinfo->type and mimeinfo->subtype */
mimeinfo->type = MIMETYPE_UNKNOWN;
str = content_type_parts[0];
+ if (str == NULL) {
+ g_strfreev(content_type_parts);
+ return;
+ }
for (typetablearray = mime_type_table; typetablearray->str != NULL; typetablearray++) {
if (g_strncasecmp(str, typetablearray->str, strlen(typetablearray->str)) == 0 &&
str[strlen(typetablearray->str)] == '/') {
}
/* Get mimeinfo->parmeters */
- for (strarray = &content_type_parts[1]; *strarray != NULL; strarray++) {
- gchar **parameters_parts;
+ add_to_mimeinfo_parameters(&content_type_parts[1], mimeinfo);
+ g_strfreev(content_type_parts);
+}
- parameters_parts = g_strsplit(*strarray, "=", 1);
- if ((parameters_parts[0] != NULL) && (parameters_parts[1] != NULL)) {
- g_strdown(parameters_parts[0]);
- if(parameters_parts[1][0] == '"')
- extract_quote(parameters_parts[1], '"');
+static void procmime_parse_content_disposition(const gchar *content_disposition, MimeInfo *mimeinfo)
+{
+ gchar **content_disp_parts;
+ gchar **strarray;
+ gchar *str;
- g_hash_table_insert(mimeinfo->parameters,
- g_strdup(parameters_parts[0]),
- g_strdup(parameters_parts[1]));
- }
- g_strfreev(parameters_parts);
- }
+ g_return_if_fail(content_disposition != NULL);
+ g_return_if_fail(mimeinfo != NULL);
- g_strfreev(content_type_parts);
+ /* Split into parts and remove trailing
+ and leading whitespaces from all strings */
+ content_disp_parts = g_strsplit(content_disposition, ";", 0);
+ for (strarray = content_disp_parts; *strarray != NULL; strarray++) {
+ g_strstrip(*strarray);
+ }
+ /* Get mimeinfo->disposition */
+ str = content_disp_parts[0];
+ if (str == NULL) {
+ g_strfreev(content_disp_parts);
+ return;
+ }
+ if (!g_strcasecmp(str, "inline"))
+ mimeinfo->disposition = DISPOSITIONTYPE_INLINE;
+ else if (!g_strcasecmp(str, "attachment"))
+ mimeinfo->disposition = DISPOSITIONTYPE_ATTACHMENT;
+ else
+ mimeinfo->disposition = DISPOSITIONTYPE_UNKNOWN;
+
+ add_to_mimeinfo_parameters(&content_disp_parts[1], mimeinfo);
+ g_strfreev(content_disp_parts);
}
+
static void procmime_parse_content_encoding(const gchar *content_encoding, MimeInfo *mimeinfo)
{
struct EncodingTable *enc_table;
gchar *content_encoding,
gchar *content_description,
gchar *content_id,
+ gchar *content_disposition,
const gchar *filename,
guint offset,
guint length)
else
mimeinfo->id = NULL;
+ if (content_disposition != NULL)
+ procmime_parse_content_disposition(content_disposition, mimeinfo);
+ else
+ mimeinfo->disposition = DISPOSITIONTYPE_INLINE;
+
/* Call parser for mime type */
switch (mimeinfo->type) {
case MIMETYPE_MESSAGE:
mimeinfo->length = buf.st_size - offset;
procmime_parse_message_rfc822(mimeinfo);
- output_mime_structure(mimeinfo, 0);
+ if (debug_get_mode())
+ output_mime_structure(mimeinfo, 0);
return mimeinfo;
}
projects / claws.git / blobdiff