X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d630f53e0de8517a4059fb4c89631af05259aa6f..6d8c6bdbe5c6c63a81b77f928b5d477a7be8fe56:/batch.c

diff --git a/batch.c b/batch.c
index 8aedd863..46466a00 100644
--- a/batch.c
+++ b/batch.c
@@ -6,6 +6,7 @@
 */
 
 #include "rsync.h"
+#include "zlib/zlib.h"
 #include <time.h>
 
 extern int am_sender;
@@ -19,11 +20,14 @@ extern int preserve_uid;
 extern int preserve_gid;
 extern int always_checksum;
 extern int do_compression;
+extern int def_compress_level;
 extern int protocol_version;
 extern char *batch_name;
 
 extern struct filter_list_struct filter_list;
 
+static int tweaked_compress_level;
+
 static int *flag_ptr[] = {
 	&recurse,		/* 0 */
 	&preserve_uid,		/* 1 */
@@ -33,7 +37,7 @@ static int *flag_ptr[] = {
 	&preserve_hard_links,	/* 5 */
 	&always_checksum,	/* 6 */
 	&xfer_dirs,		/* 7 (protocol 29) */
-	&do_compression,	/* 8 (protocol 29) */
+	&tweaked_compress_level,/* 8 (protocol 29) */
 	NULL
 };
 
@@ -54,6 +58,12 @@ void write_stream_flags(int fd)
 {
 	int i, flags;
 
+#if Z_DEFAULT_COMPRESSION == -1
+	tweaked_compress_level = do_compression ? def_compress_level + 2 : 0;
+#else
+#error internal logic error!  Fix def_compress_level logic above and below too!
+#endif
+
 	/* Start the batch file with a bitmap of data-stream-affecting
 	 * flags. */
 	if (protocol_version < 29)
@@ -88,6 +98,13 @@ void read_stream_flags(int fd)
 		else if (xfer_dirs < 2)
 			xfer_dirs = 0;
 	}
+
+	if (tweaked_compress_level == 0 || tweaked_compress_level == 2)
+		do_compression = 0;
+	else {
+		do_compression = 1;
+		def_compress_level = tweaked_compress_level - 2;
+	}
 }
 
 static void write_arg(int fd, char *arg)
@@ -148,7 +165,7 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
 		     S_IRUSR | S_IWUSR | S_IEXEC);
 	if (fd < 0) {
 		rsyserr(FERROR, errno, "Batch file %s open error",
-			safe_fname(filename));
+			filename);
 		exit_cleanup(1);
 	}
 
@@ -194,7 +211,7 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
 		write_filter_rules(fd);
 	if (write(fd, "\n", 1) != 1 || close(fd) < 0) {
 		rsyserr(FERROR, errno, "Batch file %s write error",
-			safe_fname(filename));
+			filename);
 		exit_cleanup(1);
 	}
 }
@@ -212,14 +229,14 @@ void show_flist(int index, struct file_struct **fptr)
 			(double) fptr[i]->length);
 		rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
 		rprintf(FINFO, "flist->basename=%s\n",
-			safe_fname(fptr[i]->basename));
+			fptr[i]->basename);
 		if (fptr[i]->dirname) {
 			rprintf(FINFO, "flist->dirname=%s\n",
-				safe_fname(fptr[i]->dirname));
+				fptr[i]->dirname);
 		}
 		if (am_sender && fptr[i]->dir.root) {
 			rprintf(FINFO, "flist->dir.root=%s\n",
-				safe_fname(fptr[i]->dir.root));
+				fptr[i]->dir.root);
 		}
 	}
 }
@@ -231,5 +248,5 @@ void show_argvs(int argc, char *argv[])
 
 	rprintf(FINFO, "BATCH.C:show_argvs,argc=%d\n", argc);
 	for (i = 0; i < argc; i++)
-		rprintf(FINFO, "i=%d,argv[i]=%s\n", i, safe_fname(argv[i]));
+		rprintf(FINFO, "i=%d,argv[i]=%s\n", i, argv[i]);
 }