while ((ftell(infp) < readend) && (fgets(buf, sizeof(buf), infp) != NULL)) {
gint len;
len = qp_decode_line(buf);
- fwrite(buf, len, 1, outfp);
+ fwrite(buf, 1, len, outfp);
}
} else if (encoding == ENC_BASE64) {
gchar outbuf[BUFFSIZE];
gint len;
Base64Decoder *decoder;
+ gboolean got_error = FALSE;
gboolean uncanonicalize = FALSE;
FILE *tmpfp = outfp;
decoder = base64_decoder_new();
while ((ftell(infp) < readend) && (fgets(buf, sizeof(buf), infp) != NULL)) {
len = base64_decoder_decode(decoder, buf, outbuf);
- if (len < 0) {
- g_warning("Bad BASE64 content\n");
- break;
+ if (len < 0 && !got_error) {
+ g_warning("Bad BASE64 content.\n");
+ fwrite(_("[Error decoding BASE64]\n"),
+ sizeof(gchar),
+ strlen(_("[Error decoding BASE64]\n")),
+ tmpfp);
+ got_error = TRUE;
+ continue;
+ } else if (len >= 0) {
+ /* print out the error message only once
+ * per block */
+ fwrite(outbuf, sizeof(gchar), len, tmpfp);
+ got_error = FALSE;
}
- fwrite(outbuf, sizeof(gchar), len, tmpfp);
}
base64_decoder_free(decoder);
gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
{
- FILE *infp, *outfp;
+ FILE *infp = NULL, *outfp;
gint len;
gchar *tmpfilename;
struct stat statbuf;
gchar *out = canonicalize_str(mimeinfo->data.mem);
fclose(infp);
infp = str_open_as_stream(out);
+ tmp_fp = infp;
g_free(out);
if (infp == NULL)
return FALSE;
}
dup2(oldout, 1);
-#warning FIXME_GTK2 HTML/RTF not yet utf8
/* CodeConverter seems to have no effect here */
} else if (mimeinfo->type == MIMETYPE_TEXT && !g_ascii_strcasecmp(mimeinfo->subtype, "html")) {
HTMLParser *parser;
if (!mimeinfo) return NULL;
partinfo = mimeinfo;
- while (partinfo && partinfo->type != MIMETYPE_TEXT)
+ while (partinfo && partinfo->type != MIMETYPE_TEXT) {
+ partinfo = procmime_mimeinfo_next(partinfo);
+ }
+ if (partinfo)
+ outfp = procmime_get_text_content(partinfo);
+
+ procmime_mimeinfo_free_all(mimeinfo);
+
+ return outfp;
+}
+
+
+static gboolean find_encrypted_func(GNode *node, gpointer data)
+{
+ MimeInfo *mimeinfo = (MimeInfo *) node->data;
+ MimeInfo **encinfo = (MimeInfo **) data;
+
+ if (privacy_mimeinfo_is_encrypted(mimeinfo)) {
+ *encinfo = mimeinfo;
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static MimeInfo *find_encrypted_part(MimeInfo *rootinfo)
+{
+ MimeInfo *encinfo = NULL;
+
+ g_node_traverse(rootinfo->node, G_IN_ORDER, G_TRAVERSE_ALL, -1,
+ find_encrypted_func, &encinfo);
+
+ return encinfo;
+}
+
+/* search the first encrypted text part of (multipart) MIME message,
+ decode, convert it and output to outfp. */
+FILE *procmime_get_first_encrypted_text_content(MsgInfo *msginfo)
+{
+ FILE *outfp = NULL;
+ MimeInfo *mimeinfo, *partinfo, *encinfo;
+
+ g_return_val_if_fail(msginfo != NULL, NULL);
+
+ mimeinfo = procmime_scan_message(msginfo);
+ if (!mimeinfo) {
+ return NULL;
+ }
+
+ partinfo = mimeinfo;
+ if ((encinfo = find_encrypted_part(partinfo)) != NULL) {
+ debug_print("decrypting message part\n");
+ if (privacy_mimeinfo_decrypt(encinfo) < 0)
+ return NULL;
+ }
+ partinfo = mimeinfo;
+ while (partinfo && partinfo->type != MIMETYPE_TEXT) {
partinfo = procmime_mimeinfo_next(partinfo);
+ }
if (partinfo)
outfp = procmime_get_text_content(partinfo);
return outfp;
}
+gboolean procmime_msginfo_is_encrypted(MsgInfo *msginfo)
+{
+ MimeInfo *mimeinfo, *partinfo;
+ gboolean result = FALSE;
+
+ g_return_val_if_fail(msginfo != NULL, FALSE);
+
+ mimeinfo = procmime_scan_message(msginfo);
+ if (!mimeinfo) {
+ return FALSE;
+ }
+
+ partinfo = mimeinfo;
+ result = (find_encrypted_part(partinfo) != NULL);
+ procmime_mimeinfo_free_all(mimeinfo);
+
+ return result;
+}
+
gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filename,
const gchar *str, StrFindFunc find_func)
{
static GHashTable *mime_type_table = NULL;
MimeType *mime_type;
const gchar *p;
- gchar *ext;
+ gchar *ext = NULL;
gchar *base;
if (!mime_type_table) {
guchar *p;
gchar *delim;
MimeType *mime_type;
+ gboolean fp_is_glob_file = TRUE;
if (mime_type_list)
return mime_type_list;
-
- if ((fp = fopen("/etc/mime.types", "rb")) == NULL) {
- if ((fp = fopen(SYSCONFDIR "/mime.types", "rb")) == NULL) {
- FILE_OP_ERROR(SYSCONFDIR "/mime.types", "fopen");
- return NULL;
+
+ if ((fp = fopen("/usr/share/mime/globs", "rb")) == NULL) {
+ fp_is_glob_file = FALSE;
+ if ((fp = fopen("/etc/mime.types", "rb")) == NULL) {
+ if ((fp = fopen(SYSCONFDIR "/mime.types", "rb"))
+ == NULL) {
+ FILE_OP_ERROR(SYSCONFDIR "/mime.types",
+ "fopen");
+ return NULL;
+ }
}
}
g_strstrip(buf);
p = buf;
- while (*p && !isspace(*p)) p++;
+
+ if (fp_is_glob_file) {
+ while (*p && !isspace(*p) && (*p!=':')) p++;
+ } else {
+ while (*p && !isspace(*p)) p++;
+ }
+
if (*p) {
*p = '\0';
p++;
mime_type->type = g_strdup(buf);
mime_type->sub_type = g_strdup(delim + 1);
- while (*p && isspace(*p)) p++;
+ if (fp_is_glob_file) {
+ while (*p && (isspace(*p)||(*p=='*')||(*p=='.'))) p++;
+ } else {
+ while (*p && isspace(*p)) p++;
+ }
+
if (*p)
mime_type->extension = g_strdup(p);
else
{NULL, NULL, FALSE}};
guint content_start, i;
FILE *fp;
- gint mime_major, mime_minor;
gchar *tmp;
procmime_decode_content(mimeinfo);
}
content_start = ftell(fp);
fclose(fp);
-
- if ((hentry[5].body != NULL) &&
- (sscanf(hentry[5].body, "%d.%d", &mime_major, &mime_minor) == 2) &&
- (mime_major == 1) && (mime_minor == 0)) {
- procmime_parse_mimepart(mimeinfo,
- hentry[0].body, hentry[1].body,
- hentry[2].body, hentry[3].body,
- hentry[4].body,
- mimeinfo->data.filename, content_start,
- mimeinfo->length - (content_start - mimeinfo->offset));
- } else {
- MimeInfo *subinfo;
-
- subinfo = procmime_mimeinfo_new();
- subinfo->content = MIMECONTENT_FILE;
- subinfo->encoding_type = ENC_UNKNOWN;
- subinfo->type = MIMETYPE_TEXT;
- subinfo->subtype = g_strdup("plain");
- subinfo->data.filename = g_strdup(mimeinfo->data.filename);
- subinfo->offset = content_start;
- subinfo->length = mimeinfo->length - (content_start - mimeinfo->offset);
-
- g_node_append(mimeinfo->node, subinfo->node);
- }
+
+ procmime_parse_mimepart(mimeinfo,
+ hentry[0].body, hentry[1].body,
+ hentry[2].body, hentry[3].body,
+ hentry[4].body,
+ mimeinfo->data.filename, content_start,
+ mimeinfo->length - (content_start - mimeinfo->offset));
+
for (i = 0; i < (sizeof hentry / sizeof hentry[0]); i++) {
g_free(hentry[i].body);
hentry[i].body = NULL;
break;
case ENC_AS_EXTENDED:
- g_string_append_printf(buf, "%s*=%s''", param,
- conv_get_locale_charset_str());
+ if (!g_utf8_validate(val, -1, NULL))
+ g_string_append_printf(buf, "%s*=%s''", param,
+ conv_get_locale_charset_str());
+ else
+ g_string_append_printf(buf, "%s*=%s''", param,
+ CS_INTERNAL);
for (valpos = val; *valpos != '\0'; valpos++) {
if (IS_ASCII(*valpos) && isalnum(*valpos)) {
g_string_append_printf(buf, "%c", *valpos);
break;
case MIMECONTENT_MEM:
- fwrite(mimeinfo->data.mem, strlen(mimeinfo->data.mem), sizeof(gchar), fp);
+ fwrite(mimeinfo->data.mem,
+ sizeof(gchar),
+ strlen(mimeinfo->data.mem),
+ fp);
break;
default:
if (((str2 = strstr(str, boundary)) != NULL) && ((str2 - str) >= 2) &&
(*(str2 - 1) == '-') && (*(str2 - 2) == '-'))
*(str2 - 2) = '\0';
- fwrite(str, strlen(str), sizeof(gchar), fp);
+ fwrite(str, sizeof(gchar), strlen(str), fp);
g_free(str);
break;
return 0;
case MIMECONTENT_MEM:
- fwrite(mimeinfo->data.mem, strlen(mimeinfo->data.mem), sizeof(gchar), fp);
+ fwrite(mimeinfo->data.mem,
+ sizeof(gchar),
+ strlen(mimeinfo->data.mem),
+ fp);
return 0;
default:
gchar *procmime_get_part_file_name(MimeInfo *mimeinfo)
{
gchar *base;
- const gchar *base_;
if ((mimeinfo->type == MIMETYPE_TEXT) && !g_ascii_strcasecmp(mimeinfo->subtype, "html"))
base = g_strdup("mimetmp.html");
projects / claws.git / blobdiff