[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  f643330 Restore sending of "-ef" marker to the server.
       via  bc0d094 Don't use comma_num() in FLOG output.
      from  64dff88 Don't forget about --debug and --info for rrsync.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f643330eb1dc3bb1c15228f8d6cfde1454be87b7
Author: Wayne Davison <wayned at samba.org>
Date:   Sun Oct 27 08:58:06 2013 -0700

    Restore sending of "-ef" marker to the server.

commit bc0d094d2ac70f328d24230af930a79a8b794090
Author: Wayne Davison <wayned at samba.org>
Date:   Sat Oct 26 16:28:15 2013 -0700

    Don't use comma_num() in FLOG output.

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

Summary of changes:
 log.c     |    7 ++++---
 options.c |    5 ++++-
 2 files changed, 8 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/log.c b/log.c
index 34a013b..8015a91 100644
--- a/log.c
+++ b/log.c
@@ -36,6 +36,7 @@ extern int allow_8bit_chars;
 extern int protocol_version;
 extern int always_checksum;
 extern int preserve_times;
+extern int human_readable;
 extern int msgs2stderr;
 extern int stdout_format_has_i;
 extern int stdout_format_has_o_or_i;
@@ -874,9 +875,9 @@ void log_exit(int code, const char *file, int line)
 {
 	if (code == 0) {
 		rprintf(FLOG,"sent %s bytes  received %s bytes  total size %s\n",
-			comma_num(stats.total_written),
-			comma_num(stats.total_read),
-			comma_num(stats.total_size));
+			big_num(stats.total_written),
+			big_num(stats.total_read),
+			big_num(stats.total_size));
 	} else if (am_server != 2) {
 		const char *name;
 
diff --git a/options.c b/options.c
index cebf256..cc2c1ef 100644
--- a/options.c
+++ b/options.c
@@ -2456,7 +2456,9 @@ void server_options(char **args, int *argc_p)
 
 	set_allow_inc_recurse();
 
-	/* Checking the pre-negotiated value allows --protocol=29 override. */
+	/* We don't really know the actual protocol_version at this point,
+	 * but checking the pre-negotiated value allows the user to use a
+	 * --protocol=29 override to avoid the use of this -eFLAGS opt. */
 	if (protocol_version >= 30) {
 		/* We make use of the -e option to let the server know about
 		 * any pre-release protocol version && some behavior flags. */
@@ -2477,6 +2479,7 @@ void server_options(char **args, int *argc_p)
 #ifdef ICONV_OPTION
 		argstr[x++] = 's';
 #endif
+		argstr[x++] = 'f';
 	}
 
 	if (x >= (int)sizeof argstr) { /* Not possible... */


-- 
The rsync repository.