X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/73f0ce69e7c138041a8ed66eef7fc4d217c0aedf..7842418b7b87c4c78ad8ad06fec44150c8aa0956:/batch.c

diff --git a/batch.c b/batch.c
index 144e6943..e731d9f1 100644
--- a/batch.c
+++ b/batch.c
@@ -9,11 +9,68 @@
 #include <time.h>
 
 extern char *batch_name;
-extern int delete_mode;
-extern int delete_excluded;
 extern int eol_nulls;
+extern int recurse;
+extern int preserve_links;
+extern int preserve_hard_links;
+extern int preserve_devices;
+extern int preserve_uid;
+extern int preserve_gid;
+extern int always_checksum;
+
+extern struct filter_list_struct filter_list;
+
+static int *flag_ptr[] = {
+	&recurse,
+	&preserve_uid,
+	&preserve_gid,
+	&preserve_links,
+	&preserve_devices,
+	&preserve_hard_links,
+	&always_checksum,
+	NULL
+};
+
+static char *flag_name[] = {
+	"--recurse (-r)",
+	"--owner (-o)",
+	"--group (-g)",
+	"--links (-l)",
+	"--devices (-D)",
+	"--hard-links (-H)",
+	"--checksum (-c)",
+	NULL
+};
+
+void write_stream_flags(int fd)
+{
+	int i, flags;
 
-extern struct exclude_list_struct exclude_list;
+	/* Start the batch file with a bitmap of data-stream-affecting
+	 * flags. */
+	for (i = 0, flags = 0; flag_ptr[i]; i++) {
+		if (*flag_ptr[i])
+			flags |= 1 << i;
+	}
+	write_int(fd, flags);
+}
+
+void read_stream_flags(int fd)
+{
+	int i, flags;
+
+	for (i = 0, flags = read_int(fd); flag_ptr[i]; i++) {
+		int set = flags & (1 << i) ? 1 : 0;
+		if (*flag_ptr[i] != set) {
+			if (verbose) {
+				rprintf(FINFO,
+					"%sing the %s option to match the batchfile.\n",
+					set ? "Sett" : "Clear", flag_name[i]);
+			}
+			*flag_ptr[i] = set;
+		}
+	}
+}
 
 static void write_arg(int fd, char *arg)
 {
@@ -38,12 +95,12 @@ static void write_arg(int fd, char *arg)
 	write(fd, arg, strlen(arg));
 }
 
-static void write_excludes(int fd)
+static void write_filters(int fd)
 {
-	struct exclude_struct *ent;
+	struct filter_struct *ent;
 
 	write_sbuf(fd, " <<'#E#'\n");
-	for (ent = exclude_list.head; ent; ent = ent->next) {
+	for (ent = filter_list.head; ent; ent = ent->next) {
 		char *p = ent->pattern;
 		if (ent->match_flags & MATCHFLG_INCLUDE)
 			write_buf(fd, "+ ", 2);
@@ -81,7 +138,7 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
 
 	/* Write argvs info to BATCH.sh file */
 	write_arg(fd, argv[0]);
-	if (exclude_list.head)
+	if (filter_list.head)
 		write_sbuf(fd, " --exclude-from=-");
 	for (i = 1; i < argc - file_arg_cnt; i++) {
 		p = argv[i];
@@ -110,8 +167,8 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
 	write(fd, " ${1:-", 6);
 	write_arg(fd, p);
 	write_byte(fd, '}');
-	if (exclude_list.head)
-		write_excludes(fd);
+	if (filter_list.head)
+		write_filters(fd);
 	if (write(fd, "\n", 1) != 1 || close(fd) < 0) {
 		rsyserr(FERROR, errno, "Batch file %s write error", filename);
 		exit_cleanup(1);