[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  32540aa Tweak log_delete() to send MSG_DELETED more.
      from  836e0c5 Create and use write_bigbuf() function for extra-large buffer sizes.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 32540aa09109f5f95aac2927928abde4a9ce7b41
Author: Wayne Davison <wayned at samba.org>
Date:   Thu Nov 28 11:03:48 2013 -0800

    Tweak log_delete() to send MSG_DELETED more.
    
    If the client is the sender and it is wanting to log deletes, the
    current generator code neglects to send MSG_DELETED to the client side
    unless some delete verbosity is enabled.  With this new version on the
    generator side, the logfile will now mention deletes, even if the
    sending (client) side is an older rsync.  Fixes bug 10182.

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

Summary of changes:
 log.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/log.c b/log.c
index b1ed320..8e57b25 100644
--- a/log.c
+++ b/log.c
@@ -846,13 +846,13 @@ void log_delete(const char *fname, int mode)
 
 	x.file.mode = mode;
 
-	if (!INFO_GTE(DEL, 1) && !stdout_format)
-		;
-	else if (am_server && protocol_version >= 29 && len < MAXPATHLEN) {
+	if (am_server && protocol_version >= 29 && len < MAXPATHLEN) {
 		if (S_ISDIR(mode))
 			len++; /* directories include trailing null */
 		send_msg(MSG_DELETED, fname, len, am_generator);
-	} else {
+	} else if (!INFO_GTE(DEL, 1) && !stdout_format)
+		;
+	else {
 		fmt = stdout_format_has_o_or_i ? stdout_format : "deleting %n";
 		log_formatted(FCLIENT, fmt, "del.", &x.file, fname, ITEM_DELETED, NULL);
 	}


-- 
The rsync repository.