/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto & The Claws Mail Team
+ * Copyright (C) 1999-2009 Hiroyuki Yamamoto & The Claws Mail Team
*
* 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
MimeInfo *procmime_mimeinfo_parent(MimeInfo *mimeinfo)
{
- g_return_val_if_fail(mimeinfo != NULL, NULL);
- g_return_val_if_fail(mimeinfo->node != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo->node != NULL, NULL);
if (mimeinfo->node->parent == NULL)
return NULL;
MimeInfo *procmime_mimeinfo_next(MimeInfo *mimeinfo)
{
- g_return_val_if_fail(mimeinfo != NULL, NULL);
- g_return_val_if_fail(mimeinfo->node != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo->node != NULL, NULL);
if (mimeinfo->node->children)
return (MimeInfo *) mimeinfo->node->children->data;
{
const gchar *value;
- g_return_val_if_fail(mimeinfo != NULL, NULL);
- g_return_val_if_fail(name != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(name != NULL, NULL);
value = g_hash_table_lookup(mimeinfo->dispositionparameters, name);
if (value == NULL)
gchar lastline[BUFFSIZE];
memset(lastline, 0, BUFFSIZE);
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (prefs_common.respect_flowed_format &&
mimeinfo->type == MIMETYPE_TEXT &&
FLUSH_LASTLINE();
} else if (encoding == ENC_BASE64) {
gchar outbuf[BUFFSIZE];
- gint len;
+ gint len, inlen, inread;
Base64Decoder *decoder;
gboolean got_error = FALSE;
gboolean uncanonicalize = FALSE;
FILE *tmpfp = outfp;
+ gboolean null_bytes = FALSE;
+ gboolean starting = TRUE;
if (mimeinfo->type == MIMETYPE_TEXT ||
mimeinfo->type == MIMETYPE_MESSAGE) {
}
decoder = base64_decoder_new();
- while ((ftell(infp) < readend) && (fgets(buf, sizeof(buf), infp) != NULL)) {
- len = base64_decoder_decode(decoder, buf, outbuf);
- if (len < 0 && !got_error) {
+ while ((inlen = MIN(readend - ftell(infp), sizeof(buf))) > 0 && !err) {
+ inread = fread(buf, 1, inlen, infp);
+ len = base64_decoder_decode(decoder, buf, outbuf, inread);
+ if (uncanonicalize == TRUE && strlen(outbuf) < len && starting) {
+ uncanonicalize = FALSE;
+ null_bytes = TRUE;
+ }
+ starting = FALSE;
+ if (((inread != inlen) || len < 0) && !got_error) {
g_warning("Bad BASE64 content.\n");
if (fwrite(_("[Error decoding BASE64]\n"),
sizeof(gchar),
} else if (len >= 0) {
/* print out the error message only once
* per block */
- if (fwrite(outbuf, sizeof(gchar), len, tmpfp) < len)
- err = TRUE;
+ if (null_bytes) {
+ /* we won't uncanonicalize, output to outfp directly */
+ if (fwrite(outbuf, sizeof(gchar), len, outfp) < len)
+ err = TRUE;
+ } else {
+ if (fwrite(outbuf, sizeof(gchar), len, tmpfp) < len)
+ err = TRUE;
+ }
got_error = FALSE;
}
}
return FALSE;
}
- if (mimeinfo->content == MIMECONTENT_FILE) {
+ if (mimeinfo->content == MIMECONTENT_FILE && mimeinfo->data.filename) {
if ((infp = g_fopen(mimeinfo->data.filename, "rb")) == NULL) {
g_warning("Can't open file %s\n", mimeinfo->data.filename);
+ fclose(outfp);
return FALSE;
}
} else if (mimeinfo->content == MIMECONTENT_MEM) {
infp = str_open_as_stream(mimeinfo->data.mem);
- if (infp == NULL)
+ if (infp == NULL) {
+ fclose(outfp);
return FALSE;
+ }
}
if (encoding == ENC_BASE64) {
if (canonicalize_file(mimeinfo->data.filename, tmp_file) < 0) {
g_free(tmp_file);
fclose(infp);
+ fclose(outfp);
return FALSE;
}
if ((tmp_fp = g_fopen(tmp_file, "rb")) == NULL) {
claws_unlink(tmp_file);
g_free(tmp_file);
fclose(infp);
+ fclose(outfp);
return FALSE;
}
} else {
infp = str_open_as_stream(out);
tmp_fp = infp;
g_free(out);
- if (infp == NULL)
+ if (infp == NULL) {
+ fclose(outfp);
return FALSE;
+ }
}
}
gint restlength, readlength;
gint saved_errno = 0;
- g_return_val_if_fail(outfile != NULL, -1);
- g_return_val_if_fail(mimeinfo != NULL, -1);
+ cm_return_val_if_fail(outfile != NULL, -1);
+ cm_return_val_if_fail(mimeinfo != NULL, -1);
if (mimeinfo->encoding_type != ENC_BINARY && !procmime_decode_content(mimeinfo))
return -EINVAL;
while ((restlength > 0) && ((readlength = fread(buf, 1, restlength > BUFFSIZE ? BUFFSIZE : restlength, infp)) > 0)) {
if (fwrite(buf, 1, readlength, outfp) != readlength) {
saved_errno = errno;
+ fclose(infp);
fclose(outfp);
return -(saved_errno);
}
gchar *tmpfile;
gboolean err = FALSE;
- g_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
if (!procmime_decode_content(mimeinfo))
return NULL;
? forced_charset :
procmime_mimeinfo_get_parameter(mimeinfo, "charset");
+ /* use supersets transparently when possible */
if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_ISO_8859_1))
src_codeset = CS_WINDOWS_1252;
+ else if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_X_GBK))
+ src_codeset = CS_GB18030;
+ else if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_GBK))
+ src_codeset = CS_GB18030;
+ else if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_GB2312))
+ src_codeset = CS_GB18030;
if (mimeinfo->type == MIMETYPE_TEXT && !g_ascii_strcasecmp(mimeinfo->subtype, "html")) {
SC_HTMLParser *parser;
MimeInfo *mimeinfo, *partinfo;
gboolean empty_ok = FALSE, short_scan = TRUE;
START_TIMING("");
- g_return_val_if_fail(msginfo != NULL, NULL);
+ cm_return_val_if_fail(msginfo != NULL, NULL);
/* first we try to short-scan (for speed), refusing empty parts */
scan_again:
FILE *outfp = NULL;
MimeInfo *mimeinfo, *partinfo, *encinfo;
- g_return_val_if_fail(msginfo != NULL, NULL);
+ cm_return_val_if_fail(msginfo != NULL, NULL);
mimeinfo = procmime_scan_message(msginfo);
if (!mimeinfo) {
MimeInfo *mimeinfo, *partinfo;
gboolean result = FALSE;
- g_return_val_if_fail(msginfo != NULL, FALSE);
+ cm_return_val_if_fail(msginfo != NULL, FALSE);
mimeinfo = procmime_scan_message(msginfo);
if (!mimeinfo) {
FILE *outfp;
gchar buf[BUFFSIZE];
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
- g_return_val_if_fail(mimeinfo->type == MIMETYPE_TEXT, FALSE);
- g_return_val_if_fail(str != NULL, FALSE);
- g_return_val_if_fail(find_func != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo->type == MIMETYPE_TEXT, FALSE);
+ cm_return_val_if_fail(str != NULL, FALSE);
+ cm_return_val_if_fail(find_func != NULL, FALSE);
outfp = procmime_get_text_content(mimeinfo);
gchar *filename;
gboolean found = FALSE;
- g_return_val_if_fail(msginfo != NULL, FALSE);
- g_return_val_if_fail(str != NULL, FALSE);
- g_return_val_if_fail(find_func != NULL, FALSE);
+ cm_return_val_if_fail(msginfo != NULL, FALSE);
+ cm_return_val_if_fail(str != NULL, FALSE);
+ cm_return_val_if_fail(find_func != NULL, FALSE);
filename = procmsg_get_message_file(msginfo);
if (!filename) return FALSE;
gchar *filename;
gchar f_prefix[10];
- g_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
g_snprintf(f_prefix, sizeof(f_prefix), "%08x.", id++);
fseek(fp, mimeinfo->offset, SEEK_SET);
procheader_get_header_fields(fp, hentry);
if (hentry[0].body != NULL) {
- tmp = conv_unmime_header(hentry[0].body, NULL);
+ tmp = conv_unmime_header(hentry[0].body, NULL, FALSE);
g_free(hentry[0].body);
hentry[0].body = tmp;
}
if (hentry[2].body != NULL) {
- tmp = conv_unmime_header(hentry[2].body, NULL);
+ tmp = conv_unmime_header(hentry[2].body, NULL, FALSE);
g_free(hentry[2].body);
hentry[2].body = tmp;
}
if (hentry[4].body != NULL) {
- tmp = conv_unmime_header(hentry[4].body, NULL);
+ tmp = conv_unmime_header(hentry[4].body, NULL, FALSE);
g_free(hentry[4].body);
hentry[4].body = tmp;
}
if (hentry[5].body != NULL) {
- tmp = conv_unmime_header(hentry[5].body, NULL);
+ tmp = conv_unmime_header(hentry[5].body, NULL, FALSE);
g_free(hentry[5].body);
hentry[5].body = tmp;
}
if (hentry[7].body != NULL) {
- tmp = conv_unmime_header(hentry[7].body, NULL);
+ tmp = conv_unmime_header(hentry[7].body, NULL, FALSE);
g_free(hentry[7].body);
hentry[7].body = tmp;
}
if (hentry[8].body != NULL) {
- tmp = conv_unmime_header(hentry[8].body, NULL);
+ tmp = conv_unmime_header(hentry[8].body, NULL, FALSE);
g_free(hentry[8].body);
hentry[8].body = tmp;
}
#define GET_HEADERS() { \
procheader_get_header_fields(fp, hentry); \
if (hentry[0].body != NULL) { \
- tmp = conv_unmime_header(hentry[0].body, NULL); \
+ tmp = conv_unmime_header(hentry[0].body, NULL, FALSE); \
g_free(hentry[0].body); \
hentry[0].body = tmp; \
} \
if (hentry[2].body != NULL) { \
- tmp = conv_unmime_header(hentry[2].body, NULL); \
+ tmp = conv_unmime_header(hentry[2].body, NULL, FALSE); \
g_free(hentry[2].body); \
hentry[2].body = tmp; \
} \
if (hentry[4].body != NULL) { \
- tmp = conv_unmime_header(hentry[4].body, NULL); \
+ tmp = conv_unmime_header(hentry[4].body, NULL, FALSE); \
g_free(hentry[4].body); \
hentry[4].body = tmp; \
} \
if (hentry[5].body != NULL) { \
- tmp = conv_unmime_header(hentry[5].body, NULL); \
+ tmp = conv_unmime_header(hentry[5].body, NULL, FALSE); \
g_free(hentry[5].body); \
hentry[5].body = tmp; \
} \
if (hentry[6].body != NULL) { \
- tmp = conv_unmime_header(hentry[6].body, NULL); \
+ tmp = conv_unmime_header(hentry[6].body, NULL, FALSE); \
g_free(hentry[6].body); \
hentry[6].body = tmp; \
} \
if (hentry[7].body != NULL) { \
- tmp = conv_unmime_header(hentry[7].body, NULL); \
+ tmp = conv_unmime_header(hentry[7].body, NULL, FALSE); \
g_free(hentry[7].body); \
hentry[7].body = tmp; \
} \
FILE *fp;
int result = 0;
gboolean done = FALSE;
+ gboolean start_found = FALSE;
+ gboolean end_found = FALSE;
boundary = g_hash_table_lookup(mimeinfo->typeparameters, "boundary");
if (!boundary)
FILE_OP_ERROR(mimeinfo->data.filename, "fopen");
return;
}
+
fseek(fp, mimeinfo->offset, SEEK_SET);
while ((p = fgets(buf, sizeof(buf), fp)) != NULL && result == 0) {
if (ftell(fp) - 1 > (mimeinfo->offset + mimeinfo->length))
break;
if (IS_BOUNDARY(buf, boundary, boundary_len)) {
+ start_found = TRUE;
+
if (lastoffset != -1) {
gint len = (ftell(fp) - strlen(buf)) - lastoffset - 1;
if (len < 0)
if (buf[2 + boundary_len] == '-' &&
buf[2 + boundary_len + 1] == '-') {
+ end_found = TRUE;
break;
}
for (i = 0; i < (sizeof hentry / sizeof hentry[0]) ; i++) {
lastoffset = ftell(fp);
}
}
+
+ if (start_found && !end_found && lastoffset != -1) {
+ gint len = (ftell(fp) - strlen(buf)) - lastoffset - 1;
+
+ if (len >= 0) {
+ result = procmime_parse_mimepart(mimeinfo,
+ hentry[0].body, hentry[1].body,
+ hentry[2].body, hentry[3].body,
+ hentry[4].body, hentry[5].body,
+ hentry[6].body, hentry[7].body,
+ mimeinfo->data.filename, lastoffset,
+ len, short_scan);
+ }
+ mimeinfo->broken = TRUE;
+ }
+
for (i = 0; i < (sizeof hentry / sizeof hentry[0]); i++) {
g_free(hentry[i].body);
hentry[i].body = NULL;
down_attr = g_utf8_strdown(attribute, -1);
orig_down_attr = down_attr;
- len = strlen(down_attr);
- if (down_attr[len - 1] == '*') {
+ len = down_attr ? strlen(down_attr):0;
+ if (len > 0 && down_attr[len - 1] == '*') {
gchar *srcpos, *dstpos, *endpos;
convert = TRUE;
while (value[strlen(value)-1] == ' ')
value[strlen(value)-1] = '\0';
}
- if (strrchr(down_attr, '*') != NULL) {
+ if (down_attr && strrchr(down_attr, '*') != NULL) {
gchar *tmpattr;
tmpattr = g_strdup(down_attr);
static void procmime_parse_content_type(const gchar *content_type, MimeInfo *mimeinfo)
{
- g_return_if_fail(content_type != NULL);
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(content_type != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
/* RFC 2045, page 13 says that the mime subtype is MANDATORY;
* if it's not available we use the default Content-Type */
{
gchar *tmp, *params;
- g_return_if_fail(content_disposition != NULL);
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(content_disposition != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
tmp = g_strdup(content_disposition);
if ((params = strchr(tmp, ';')) != NULL) {
static gboolean procmime_mimeparser_parse(MimeParser *parser, MimeInfo *mimeinfo)
{
- g_return_val_if_fail(parser->parse != NULL, FALSE);
+ cm_return_val_if_fail(parser->parse != NULL, FALSE);
return parser->parse(parser, mimeinfo);
}
/* Create MimeInfo */
mimeinfo = procmime_mimeinfo_new();
mimeinfo->content = MIMECONTENT_FILE;
+
if (parent != NULL) {
if (g_node_depth(parent->node) > 32) {
/* 32 is an arbitrary value
{
MimeInfo *mimeinfo;
- g_return_val_if_fail(filename != NULL, NULL);
+ cm_return_val_if_fail(filename != NULL, NULL);
mimeinfo = procmime_scan_file_with_offset(filename, 0, short_scan);
gchar buf[BUFFSIZE];
gint offset = 0;
- g_return_val_if_fail(filename != NULL, NULL);
+ cm_return_val_if_fail(filename != NULL, NULL);
/* Open file */
if ((fp = g_fopen(filename, "rb")) == NULL)
g_string_append_printf(buf, "%s=\"%s\"", param, val);
break;
+#if 0 /* we don't use that for now */
case ENC_AS_EXTENDED:
if (!g_utf8_validate(val, -1, NULL))
g_string_append_printf(buf, "%s*=%s''", param,
g_string_append_printf(buf, "%%%s", hexstr);
}
}
- break;
-
+ break;
+#else
+ case ENC_AS_EXTENDED:
+ debug_print("Unhandled ENC_AS_EXTENDED.");
+ break;
+#endif
case ENC_AS_ENCWORD:
len = MAX(strlen(val)*6, 512);
tmp = g_malloc(len+1);
projects / claws.git / blobdiff