- Use the "--filter=._-" option instead of --exclude-from=- if the

[rsync/rsync.git] / batch.c

diff --git a/batch.c b/batch.c
index 8d3f796..8a394d2 100644 (file)
--- a/batch.c
+++ b/batch.c
@@ -9,11 +9,121 @@
 #include <time.h>
 
 extern char *batch_name;
+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 int protocol_version;
 
-void write_batch_argvs_file(int argc, char *argv[])
+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;
+
+       /* 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)
+{
+       char *x, *s;
+
+       if (*arg == '-' && (x = strchr(arg, '=')) != NULL) {
+               write(fd, arg, x - arg + 1);
+               arg += x - arg + 1;
+       }
+
+       if (strpbrk(arg, " \"'&;|[]()$#!*?^\\") != NULL) {
+               write(fd, "'", 1);
+               for (s = arg; (x = strchr(s, '\'')) != NULL; s = x + 1) {
+                       write(fd, s, x - s + 1);
+                       write(fd, "'", 1);
+               }
+               write(fd, s, strlen(s));
+               write(fd, "'", 1);
+               return;
+       }
+
+       write(fd, arg, strlen(arg));
+}
+
+static void write_filter_rules(int fd)
+{
+       struct filter_struct *ent;
+
+       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);
+               write_buf(fd, p, plen);
+               write_sbuf(fd, ent->pattern);
+               if (ent->match_flags & MATCHFLG_DIRECTORY)
+                       write_byte(fd, '/');
+               write_byte(fd, eol_nulls ? 0 : '\n');
+       }
+       if (eol_nulls)
+               write_sbuf(fd, ";\n");
+       write_sbuf(fd, "#E#");
+}
+
+/* This routine tries to write out an equivalent --read-batch command
+ * given the user's --write-batch args.  However, it doesn't really
+ * understand most of the options, so it uses some overly simple
+ * heuristics to munge the command line into something that will
+ * (hopefully) work. */
+void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
 {
        int fd, i;
-       char filename[MAXPATHLEN];
+       char *p, filename[MAXPATHLEN];
 
        stringjoin(filename, sizeof filename,
                   batch_name, ".sh", NULL);
@@ -24,33 +134,48 @@ void write_batch_argvs_file(int argc, char *argv[])
                exit_cleanup(1);
        }
 
-       /* Write argvs info to BATCH.rsync_argvs file */
-       for (i = 0; i < argc; i++) {
-               if (i == argc - 2) /* Skip source directory on cmdline */
-                       continue;
-               if (strncmp(argv[i], "--files-from", 12) == 0) {
-                       if (strchr(argv[i], '=') == NULL)
+       /* Write argvs info to BATCH.sh file */
+       write_arg(fd, argv[0]);
+       if (filter_list.head) {
+               if (protocol_version >= 29)
+                       write_sbuf(fd, " --filter=._-");
+               else
+                       write_sbuf(fd, " --exclude-from=-");
+       }
+       for (i = 1; i < argc - file_arg_cnt; i++) {
+               p = argv[i];
+               if (strncmp(p, "--files-from", 12) == 0
+                   || strncmp(p, "--filter", 8) == 0
+                   || strncmp(p, "--include", 9) == 0
+                   || strncmp(p, "--exclude", 9) == 0) {
+                       if (strchr(p, '=') == NULL)
                                i++;
                        continue;
                }
-               if (i != 0)
-                       write(fd, " ", 1);
-               if (strncmp(argv[i], "--write-batch", 13) == 0) {
-                       write(fd, "--read", 6);
-                       write(fd, argv[i] + 7, strlen(argv[i] + 7));
-               } else if (i == argc - 1) {
-                       char *p = find_colon(argv[i]);
-                       if (p) {
-                               if (*++p == ':')
-                                       p++;
-                       } else
-                               p = argv[i];
-                       write(fd, "${1:-", 5);
-                       write(fd, p, strlen(p));
-                       write(fd, "}", 1);
+               if (strcmp(p, "-f") == 0) {
+                       i++;
+                       continue;
+               }
+               write(fd, " ", 1);
+               if (strncmp(p, "--write-batch", 13) == 0) {
+                       write(fd, "--read-batch", 12);
+                       if (p[13] == '=') {
+                               write(fd, "=", 1);
+                               write_arg(fd, p + 14);
+                       }
                } else
-                       write(fd, argv[i], strlen(argv[i]));
+                       write_arg(fd, p);
        }
+       if ((p = find_colon(argv[argc - 1])) != NULL) {
+               if (*++p == ':')
+                       p++;
+       } else
+               p = argv[argc - 1];
+       write(fd, " ${1:-", 6);
+       write_arg(fd, p);
+       write_byte(fd, '}');
+       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);
                exit_cleanup(1);