From: Paul Mangan <paul@claws-mail.org>
Date: Thu, 23 May 2002 07:08:55 +0000 (+0000)
Subject: more sync with 0.7.6cvs13
X-Git-Tag: rel_0_7_7~52
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=8a4ba453f9a862ef1364f5388b15c23f14563afa

more sync with 0.7.6cvs13
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a94e1d2d2..e89120992 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-05-23 [paul]	0.7.6claws12
+
+	* more sync with 0.7.6cvs13
+	  src/compose.c
+		see ChangeLog 2002-05-22
+
 2002-05-22 [paul]	0.7.6claws11
 
 	* sync with 0.7.6cvs13
diff --git a/configure.in b/configure.in
index e5acc4daa..de5101ddc 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws11
+EXTRA_VERSION=claws12
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/compose.c b/src/compose.c
index 53da4c983..e8ec3541f 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -2996,18 +2996,25 @@ static gint compose_bounce_write_to_file(Compose *compose, const gchar *file)
 
 	compose_bounce_write_headers(compose, fdest);
 
-	while ((len = fread(buf, sizeof(gchar), BUFFSIZE, fp)) > 0) {
-		if (fwrite(buf, sizeof(gchar), len, fdest) == -1)
+	while ((len = fread(buf, sizeof(gchar), sizeof(buf), fp)) > 0) {
+		if (fwrite(buf, sizeof(gchar), len, fdest) != len) {
+			FILE_OP_ERROR(file, "fwrite");
 			goto error;
+		}
 	}
 
-	fclose(fdest);
 	fclose(fp);
+	if (fclose(fdest) == EOF) {
+		FILE_OP_ERROR(file, "fclose");
+		unlink(file);
+		return -1;
+	}
 
 	return 0;
  error:
-	fclose(fdest);
 	fclose(fp);
+	fclose(fdest);
+	unlink(file);
 
 	return -1;
 }