X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/41961db0bd8e54d3f62c7e706125e01be357a261..0417c34e2d641cbac292ba5cf8a619249c87d4e3:/batch.c

diff --git a/batch.c b/batch.c
index 28f9a509..8aedd863 100644
--- a/batch.c
+++ b/batch.c
@@ -8,7 +8,6 @@
 #include "rsync.h"
 #include <time.h>
 
-extern int itemize_changes;
 extern int am_sender;
 extern int eol_nulls;
 extern int recurse;
@@ -19,22 +18,22 @@ extern int preserve_devices;
 extern int preserve_uid;
 extern int preserve_gid;
 extern int always_checksum;
+extern int do_compression;
 extern int protocol_version;
 extern char *batch_name;
 
 extern struct filter_list_struct filter_list;
 
-static int fudged_recurse;
-
 static int *flag_ptr[] = {
-	&fudged_recurse,
-	&preserve_uid,
-	&preserve_gid,
-	&preserve_links,
-	&preserve_devices,
-	&preserve_hard_links,
-	&always_checksum,
-	&itemize_changes,
+	&recurse,		/* 0 */
+	&preserve_uid,		/* 1 */
+	&preserve_gid,		/* 2 */
+	&preserve_links,	/* 3 */
+	&preserve_devices,	/* 4 */
+	&preserve_hard_links,	/* 5 */
+	&always_checksum,	/* 6 */
+	&xfer_dirs,		/* 7 (protocol 29) */
+	&do_compression,	/* 8 (protocol 29) */
 	NULL
 };
 
@@ -47,7 +46,7 @@ static char *flag_name[] = {
 	"--hard-links (-H)",
 	"--checksum (-c)",
 	"--dirs (-d)",
-	"--itemize-changes (-i)",
+	"--compress (-z)",
 	NULL
 };
 
@@ -57,7 +56,8 @@ void write_stream_flags(int fd)
 
 	/* Start the batch file with a bitmap of data-stream-affecting
 	 * flags. */
-	fudged_recurse = recurse < 0;
+	if (protocol_version < 29)
+		flag_ptr[7] = NULL;
 	for (i = 0, flags = 0; flag_ptr[i]; i++) {
 		if (*flag_ptr[i])
 			flags |= 1 << i;
@@ -69,9 +69,8 @@ void read_stream_flags(int fd)
 {
 	int i, flags;
 
-	fudged_recurse = recurse < 0;
 	if (protocol_version < 29)
-		xfer_dirs = 0;
+		flag_ptr[7] = NULL;
 	for (i = 0, flags = read_int(fd); flag_ptr[i]; i++) {
 		int set = flags & (1 << i) ? 1 : 0;
 		if (*flag_ptr[i] != set) {
@@ -83,9 +82,12 @@ void read_stream_flags(int fd)
 			*flag_ptr[i] = set;
 		}
 	}
-	recurse = fudged_recurse ? -1 : 0;
-	if (protocol_version < 29)
-		xfer_dirs = recurse ? 1 : 0;
+	if (protocol_version < 29) {
+		if (recurse)
+			xfer_dirs |= 1;
+		else if (xfer_dirs < 2)
+			xfer_dirs = 0;
+	}
 }
 
 static void write_arg(int fd, char *arg)
@@ -137,7 +139,7 @@ static void write_filter_rules(int fd)
  * (hopefully) work. */
 void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
 {
-	int fd, i;
+	int fd, i, len;
 	char *p, filename[MAXPATHLEN];
 
 	stringjoin(filename, sizeof filename,
@@ -173,19 +175,17 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
 			continue;
 		}
 		write(fd, " ", 1);
-		if (strncmp(p, "--write-batch", 13) == 0) {
+		if (strncmp(p, "--write-batch", len = 13) == 0
+		 || strncmp(p, "--only-write-batch", len = 18) == 0) {
 			write(fd, "--read-batch", 12);
-			if (p[13] == '=') {
+			if (p[len] == '=') {
 				write(fd, "=", 1);
-				write_arg(fd, p + 14);
+				write_arg(fd, p + len + 1);
 			}
 		} else
 			write_arg(fd, p);
 	}
-	if ((p = find_colon(argv[argc - 1])) != NULL) {
-		if (*++p == ':')
-			p++;
-	} else
+	if (!(p = check_for_hostspec(argv[argc - 1], &p, &i)))
 		p = argv[argc - 1];
 	write(fd, " ${1:-", 6);
 	write_arg(fd, p);