[Commits] [SCM] claws branch, master, updated. 3.17.0-85-g54b9cf1

[Colin]

The branch, master has been updated
       via  54b9cf143bf5dca96254d16028381f8eec753d61 (commit)
      from  2afd55869a7b6ad215cab2f19b1c23a385ae87d9 (commit)

Summary of changes:
 configure.ac   |    2 +-
 src/procmime.c |   86 ++++++++++++++++++++++++++++++++++++++------------------
 2 files changed, 59 insertions(+), 29 deletions(-)


- Log -----------------------------------------------------------------
commit 54b9cf143bf5dca96254d16028381f8eec753d61
Author: Colin Leroy <colin at colino.net>
Date:   Sat Oct 6 12:48:01 2018 +0200

    Use a memory-based FILE pointer when we can; speeds up search.

diff --git a/configure.ac b/configure.ac
index c82171e..c6ef76f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -427,7 +427,7 @@ AC_CHECK_FUNCS(gethostname mkdir mktime socket strstr strchr \
 	       uname flock lockf inet_aton inet_addr \
 	       fchmod mkstemp truncate getuid regcomp)
 
-AC_CHECK_FUNCS(fgets_unlocked fwrite_unlocked)
+AC_CHECK_FUNCS(fgets_unlocked fwrite_unlocked fmemopen)
 
 dnl *****************
 dnl ** common code **
diff --git a/src/procmime.c b/src/procmime.c
index da81590..c47c7b6 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -64,6 +64,7 @@ MimeInfo *procmime_mimeinfo_new(void)
 	MimeInfo *mimeinfo;
 
 	mimeinfo = g_new0(MimeInfo, 1);
+
 	mimeinfo->content	 = MIMECONTENT_EMPTY;
 	mimeinfo->data.filename	 = NULL;
 
@@ -702,14 +703,14 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
 	return TRUE;
 }
 
-gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
+static gint procmime_get_part_to_stream(FILE *outfp, MimeInfo *mimeinfo)
 {
-	FILE *infp, *outfp;
+	FILE *infp;
 	gchar buf[BUFFSIZE];
 	gint restlength, readlength;
 	gint saved_errno = 0;
 
-	cm_return_val_if_fail(outfile != NULL, -1);
+	cm_return_val_if_fail(outfp != NULL, -1);
 	cm_return_val_if_fail(mimeinfo != NULL, -1);
 
 	if (mimeinfo->encoding_type != ENC_BINARY && !procmime_decode_content(mimeinfo))
@@ -726,12 +727,6 @@ gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
 		procmime_fclose(infp);
 		return -(saved_errno);
 	}
-	if ((outfp = procmime_fopen(outfile, "wb")) == NULL) {
-		saved_errno = errno;
-		FILE_OP_ERROR(outfile, "fopen");
-		procmime_fclose(infp);
-		return -(saved_errno);
-	}
 
 	restlength = mimeinfo->length;
 
@@ -739,13 +734,33 @@ gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
 		if (SC_FWRITE(buf, 1, readlength, outfp) != readlength) {
 			saved_errno = errno;
 			procmime_fclose(infp);
-			procmime_fclose(outfp);
 			return -(saved_errno);
 		}
 		restlength -= readlength;
 	}
 
 	procmime_fclose(infp);
+	rewind(outfp);
+
+	return 0;
+}
+
+gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
+{
+	FILE *outfp;
+	gint result;
+	gint saved_errno = 0;
+
+	cm_return_val_if_fail(outfile != NULL, -1);
+
+	if ((outfp = procmime_fopen(outfile, "wb")) == NULL) {
+		saved_errno = errno;
+		FILE_OP_ERROR(outfile, "fopen");
+		return -(saved_errno);
+	}
+
+	result = procmime_get_part_to_stream(outfp, mimeinfo);
+
 	if (procmime_fclose(outfp) == EOF) {
 		saved_errno = errno;
 		FILE_OP_ERROR(outfile, "fclose");
@@ -753,7 +768,7 @@ gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
 		return -(saved_errno);
 	}
 
-	return 0;
+	return result;
 }
 
 gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
@@ -765,8 +780,9 @@ gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
 	gboolean conv_fail = FALSE;
 	gchar buf[BUFFSIZE];
 	gchar *str;
-	gchar *tmpfile;
 	gboolean scan_ret = FALSE;
+	gchar *tmpfile = NULL;
+	int r;
 
 	cm_return_val_if_fail(mimeinfo != NULL, TRUE);
 	cm_return_val_if_fail(scan_callback != NULL, TRUE);
@@ -774,17 +790,26 @@ gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
 	if (!procmime_decode_content(mimeinfo))
 		return TRUE;
 
+#if HAVE_FMEMOPEN
+	tmpfp = fmemopen(NULL, mimeinfo->length * 2, "w+");
+#else
 	tmpfile = procmime_get_tmp_file_name(mimeinfo);
-	if (tmpfile == NULL)
+	if (tmpfile == NULL) {
+		g_warning("no filename\n");
 		return TRUE;
+	}
+
+	tmpfp = procmime_fopen(tmpfile, "w+");
+#endif
 
-	if (procmime_get_part(tmpfile, mimeinfo) < 0) {
+	if (tmpfp == NULL) {
 		g_free(tmpfile);
+		FILE_OP_ERROR(tmpfile, "open");
 		return TRUE;
 	}
 
-	tmpfp = procmime_fopen(tmpfile, "rb");
-	if (tmpfp == NULL) {
+	if ((r = procmime_get_part_to_stream(tmpfp, mimeinfo)) < 0) {
+		g_warning("procmime_get_part_to_stream error %d\n", r);
 		g_free(tmpfile);
 		return TRUE;
 	}
@@ -850,8 +875,11 @@ gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
 		g_warning("procmime_get_text_content(): Code conversion failed.");
 
 	procmime_fclose(tmpfp);
+
+#if !HAVE_FMEMOPEN
 	claws_unlink(tmpfile);
 	g_free(tmpfile);
+#endif
 
 	return scan_ret;
 }
@@ -894,31 +922,33 @@ FILE *procmime_get_text_content(MimeInfo *mimeinfo)
 FILE *procmime_get_binary_content(MimeInfo *mimeinfo)
 {
 	FILE *outfp;
-	gchar *tmpfile;
+	gchar *tmpfile = NULL;
 
 	cm_return_val_if_fail(mimeinfo != NULL, NULL);
 
 	if (!procmime_decode_content(mimeinfo))
 		return NULL;
 
+#if HAVE_FMEMOPEN
+	outfp = fmemopen(NULL, mimeinfo->length * 2, "w+");
+#else
 	tmpfile = procmime_get_tmp_file_name(mimeinfo);
-	if (tmpfile == NULL)
-		return NULL;
-
-	if (procmime_get_part(tmpfile, mimeinfo) < 0) {
-		g_free(tmpfile);
-		return NULL;
+	if (tmpfile == NULL) {
+		g_warning("no filename\n");
+		return TRUE;
 	}
 
-	outfp = procmime_fopen(tmpfile, "rb");
-	if (outfp == NULL) {
+	outfp = procmime_fopen(tmpfile, "w+");
+#endif
+
+	if (tmpfile != NULL) {
 		g_unlink(tmpfile);
 		g_free(tmpfile);
-		return NULL;
 	}
 
-	g_unlink(tmpfile);
-	g_free(tmpfile);
+	if (procmime_get_part_to_stream(outfp, mimeinfo) < 0) {
+		return NULL;
+	}
 
 #ifdef HAVE_FGETS_UNLOCKED
 	funlockfile(outfp);

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


hooks/post-receive
-- 
Claws Mail