dovecot-1.2-sieve: Slightly improved error messages during binar...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-1.2-sieve/rev/0ee2aaa683e3
changeset: 1211:0ee2aaa683e3
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Fri Jan 15 22:56:52 2010 +0100
description:
Slightly improved error messages during binary save.

diffstat:

 src/lib-sieve/sieve-binary.c |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 8d8d87bc7d6e -r 0ee2aaa683e3 src/lib-sieve/sieve-binary.c
--- a/src/lib-sieve/sieve-binary.c	Fri Jan 15 18:36:43 2010 +0100
+++ b/src/lib-sieve/sieve-binary.c	Fri Jan 15 22:56:52 2010 +0100
@@ -647,25 +647,28 @@
 	fd = safe_mkstemp_hostpid(temp_path, save_mode, (uid_t)-1, (gid_t)-1);
 	if ( fd < 0 ) {
 		if ( errno == EACCES ) {
-			sieve_sys_error("failed to save binary: %s",
+			sieve_sys_error("failed to save binary temporary file: %s",
 				eacces_error_get_creating("open", str_c(temp_path)));
 		} else {
-			sieve_sys_error("failed to save binary: open(%s) failed: %m", 
-				str_c(temp_path));
+			sieve_sys_error("failed to save binary temporary file: "
+				"open(%s) failed: %m", str_c(temp_path));
 		}
 		return FALSE;
 	}
 
+	/* Save binary */
 	stream = o_stream_create_fd(fd, 0, FALSE);
 	result = _sieve_binary_save(sbin, stream);
 	o_stream_destroy(&stream);
- 
-	if (close(fd) < 0)
+
+	/* Close saved binary */ 
+	if ( close(fd) < 0 ) {
 		sieve_sys_error("failed to close saved binary temporary file: "
 			"close(fd=%s) failed: %m", str_c(temp_path));
+	}
 
 	/* Replace any original binary atomically */
-	if (result && (rename(str_c(temp_path), path) < 0)) {
+	if ( result && (rename(str_c(temp_path), path) < 0) ) {
 		if ( errno == EACCES ) {
 			sieve_sys_error("failed to replace existing binary: %s", 
 				eacces_error_get_creating("rename", path));