[Commits] [SCM] claws branch, master, updated. 3.17.3-122-gfde39ef

[ticho at claws-mail.org]

The branch, master has been updated
       via  fde39ef20d6cdb37b1863227cafe61aa412ec07a (commit)
      from  299b18fb4b0c5381af7017421367fe8fa8f82c68 (commit)

Summary of changes:
 src/procmime.c |   80 +++++++++++++++++++++++---------------------------------
 1 file changed, 33 insertions(+), 47 deletions(-)


- Log -----------------------------------------------------------------
commit fde39ef20d6cdb37b1863227cafe61aa412ec07a
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Tue Mar 5 21:54:48 2019 +0100

    Rewrite procmime_get_part_as_string() to not use a temporary file

diff --git a/src/procmime.c b/src/procmime.c
index 004f57f..e18215f 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -2664,60 +2664,46 @@ gchar *procmime_get_part_file_name(MimeInfo *mimeinfo)
 
 gchar *procmime_get_part_as_string(MimeInfo *mimeinfo)
 {
-	gchar *textdata = NULL;
-	gchar *filename = NULL;
-	FILE *fp;
+	FILE *infp;
+	gchar *data;
+	gint length, readlength;
 
-	cm_return_val_if_fail(mimeinfo != NULL, 0);
-	procmime_decode_content(mimeinfo);
+	cm_return_val_if_fail(mimeinfo != NULL, NULL);
+
+	if (mimeinfo->encoding_type != ENC_BINARY &&
+			!procmime_decode_content(mimeinfo))
+		return NULL;
 
 	if (mimeinfo->content == MIMECONTENT_MEM)
-		textdata = g_strdup(mimeinfo->data.mem);
-	else {
-		filename = procmime_get_tmp_file_name(mimeinfo);
-		if (procmime_get_part(filename, mimeinfo) < 0) {
-			g_warning("error dumping temporary file '%s'", filename);
-			g_free(filename);
-			return NULL;
-		}
-		fp = claws_fopen(filename,"rb");
-		if (!fp) {
-			g_warning("error opening temporary file '%s'", filename);
+		return g_strdup(mimeinfo->data.mem);
 
-			g_free(filename);
-			return NULL;
-		}
-		textdata = file_read_stream_to_str_no_recode(fp);
+	if ((infp = claws_fopen(mimeinfo->data.filename, "rb")) == NULL) {
+		FILE_OP_ERROR(mimeinfo->data.filename, "claws_fopen");
+		return NULL;
+	}
 
-		claws_fclose(fp);
-		g_unlink(filename);
-		g_free(filename);
+	if (fseek(infp, mimeinfo->offset, SEEK_SET) < 0) {
+		FILE_OP_ERROR(mimeinfo->data.filename, "fseek");
+		claws_fclose(infp);
+		return NULL;
 	}
 
-	if (!g_utf8_validate(textdata, -1, NULL)) {
-		gchar *tmp = NULL;
-		codeconv_set_strict(TRUE);
-		if (procmime_mimeinfo_get_parameter(mimeinfo, "charset")) {
-			tmp = conv_codeset_strdup(textdata,
-				procmime_mimeinfo_get_parameter(mimeinfo, "charset"),
-				CS_UTF_8);
-		}
-		if (!tmp) {
-			tmp = conv_codeset_strdup(textdata,
-				conv_get_locale_charset_str_no_utf8(),
-				CS_UTF_8);
-		}
-		codeconv_set_strict(FALSE);
-		if (!tmp) {
-			tmp = conv_codeset_strdup(textdata,
-				conv_get_locale_charset_str_no_utf8(),
-				CS_UTF_8);
-		}
-		if (tmp) {
-			g_free(textdata);
-			textdata = tmp;
-		}
+	length = mimeinfo->length;
+	data = g_malloc(length + 1);
+	cm_return_val_if_fail(data != NULL, NULL);
+
+	readlength = claws_fread(data, length, 1, infp);
+	if (readlength <= 0) {
+		FILE_OP_ERROR(mimeinfo->data.filename, "fread");
+		g_free(data);
+		claws_fclose(infp);
+		return NULL;
 	}
 
-	return textdata;
+	claws_fclose(infp);
+
+	data[length] = '\0';
+
+	return data;
 }
+

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail