X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2b1366635dc416420ed2617260aafe17d259ae0f..4875d6b64dd0ed8d451746cc0cc609cff36192bd:/batch.c

diff --git a/batch.c b/batch.c
index 5df7b787..68d284d6 100644
--- a/batch.c
+++ b/batch.c
@@ -11,6 +11,7 @@
 extern int am_sender;
 extern int eol_nulls;
 extern int recurse;
+extern int xfer_dirs;
 extern int preserve_links;
 extern int preserve_hard_links;
 extern int preserve_devices;
@@ -22,14 +23,17 @@ extern char *batch_name;
 
 extern struct filter_list_struct filter_list;
 
+static int fudged_recurse;
+
 static int *flag_ptr[] = {
-	&recurse,
+	&fudged_recurse,
 	&preserve_uid,
 	&preserve_gid,
 	&preserve_links,
 	&preserve_devices,
 	&preserve_hard_links,
 	&always_checksum,
+	&xfer_dirs,
 	NULL
 };
 
@@ -41,6 +45,7 @@ static char *flag_name[] = {
 	"--devices (-D)",
 	"--hard-links (-H)",
 	"--checksum (-c)",
+	"--dirs (-d)",
 	NULL
 };
 
@@ -50,6 +55,7 @@ void write_stream_flags(int fd)
 
 	/* Start the batch file with a bitmap of data-stream-affecting
 	 * flags. */
+	fudged_recurse = recurse < 0;
 	for (i = 0, flags = 0; flag_ptr[i]; i++) {
 		if (*flag_ptr[i])
 			flags |= 1 << i;
@@ -61,6 +67,9 @@ void read_stream_flags(int fd)
 {
 	int i, flags;
 
+	fudged_recurse = recurse < 0;
+	if (protocol_version < 29)
+		xfer_dirs = 0;
 	for (i = 0, flags = read_int(fd); flag_ptr[i]; i++) {
 		int set = flags & (1 << i) ? 1 : 0;
 		if (*flag_ptr[i] != set) {
@@ -72,6 +81,9 @@ void read_stream_flags(int fd)
 			*flag_ptr[i] = set;
 		}
 	}
+	recurse = fudged_recurse ? -1 : 0;
+	if (protocol_version < 29)
+		xfer_dirs = recurse ? 1 : 0;
 }
 
 static void write_arg(int fd, char *arg)
@@ -104,7 +116,7 @@ static void write_filter_rules(int fd)
 	write_sbuf(fd, " <<'#E#'\n");
 	for (ent = filter_list.head; ent; ent = ent->next) {
 		unsigned int plen;
-		char *p = get_rule_prefix(ent->match_flags, "- ", &plen);
+		char *p = get_rule_prefix(ent->match_flags, "- ", 0, &plen);
 		write_buf(fd, p, plen);
 		write_sbuf(fd, ent->pattern);
 		if (ent->match_flags & MATCHFLG_DIRECTORY)
@@ -131,7 +143,8 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
 	fd = do_open(filename, O_WRONLY | O_CREAT | O_TRUNC,
 		     S_IRUSR | S_IWUSR | S_IEXEC);
 	if (fd < 0) {
-		rsyserr(FERROR, errno, "Batch file %s open error", filename);
+		rsyserr(FERROR, errno, "Batch file %s open error",
+			safe_fname(filename));
 		exit_cleanup(1);
 	}
 
@@ -178,7 +191,8 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
 	if (filter_list.head)
 		write_filter_rules(fd);
 	if (write(fd, "\n", 1) != 1 || close(fd) < 0) {
-		rsyserr(FERROR, errno, "Batch file %s write error", filename);
+		rsyserr(FERROR, errno, "Batch file %s write error",
+			safe_fname(filename));
 		exit_cleanup(1);
 	}
 }
@@ -195,25 +209,25 @@ void show_flist(int index, struct file_struct **fptr)
 		rprintf(FINFO, "flist->length=%.0f\n",
 			(double) fptr[i]->length);
 		rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
-		rprintf(FINFO, "flist->basename=%s\n", fptr[i]->basename);
-		if (fptr[i]->dirname)
+		rprintf(FINFO, "flist->basename=%s\n",
+			safe_fname(fptr[i]->basename));
+		if (fptr[i]->dirname) {
 			rprintf(FINFO, "flist->dirname=%s\n",
-				fptr[i]->dirname);
-		if (am_sender && fptr[i]->dir.root)
+				safe_fname(fptr[i]->dirname));
+		}
+		if (am_sender && fptr[i]->dir.root) {
 			rprintf(FINFO, "flist->dir.root=%s\n",
-				fptr[i]->dir.root);
+				safe_fname(fptr[i]->dir.root));
+		}
 	}
 }
 
+/* for debugging */
 void show_argvs(int argc, char *argv[])
 {
-	/*  for debugging  * */
-
 	int i;
-	rprintf(FINFO, "BATCH.C:show_argvs,argc=%d\n", argc);
-	for (i = 0; i < argc; i++) {
-		/*    if (argv[i])   */
-		rprintf(FINFO, "i=%d,argv[i]=%s\n", i, argv[i]);
 
-	}
+	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]));
 }