[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  6efc43cc Fix -z choice with older rsyncs.
      from  4496e0e8 A few more compression tweaks.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6efc43cc0aea9ae3e0e3b0ec36cd7cf3d12be15b
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sun May 24 19:16:05 2020 -0700

    Fix -z choice with older rsyncs.

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

Summary of changes:
 compat.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/compat.c b/compat.c
index 20dc85fd..f1cc02c7 100644
--- a/compat.c
+++ b/compat.c
@@ -174,7 +174,9 @@ void parse_compress_choice(int final_call)
 			exit_cleanup(RERR_UNSUPPORTED);
 		}
 		do_compression = nni->num;
-	} else
+	} else if (do_compression)
+		do_compression = CPRES_ZLIB;
+	else
 		do_compression = CPRES_NONE;
 
 	if (do_compression == CPRES_NONE)
@@ -184,8 +186,10 @@ void parse_compress_choice(int final_call)
 		const char *c_s = am_server ? "Server" : "Client";
 		if (valid_compressions.negotiated_name)
 			rprintf(FINFO, "%s negotiated compress: %s\n", c_s, valid_compressions.negotiated_name);
-		else
-			rprintf(FINFO, "%s compress: %s\n", c_s, do_compression ? compress_choice : "none");
+		else {
+			struct name_num_item *nni = get_nni_by_num(&valid_compressions, do_compression);
+			rprintf(FINFO, "%s compress: %s\n", c_s, nni ? nni->name : "UNKNOWN");
+		}
 	}
 }
 


-- 
The rsync repository.