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

[rsync/rsync.git] / batch.c

diff --git a/batch.c b/batch.c
index 4c91f82..8a394d2 100644 (file)
--- a/batch.c
+++ b/batch.c
@@ -9,8 +9,6 @@
 #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;
@@ -19,8 +17,9 @@ extern int preserve_devices;
 extern int preserve_uid;
 extern int preserve_gid;
 extern int always_checksum;
+extern int protocol_version;
 
-extern struct exclude_list_struct exclude_list;
+extern struct filter_list_struct filter_list;
 
 static int *flag_ptr[] = {
        &recurse,
@@ -64,9 +63,11 @@ void read_stream_flags(int fd)
        for (i = 0, flags = read_int(fd); flag_ptr[i]; i++) {
                int set = flags & (1 << i) ? 1 : 0;
                if (*flag_ptr[i] != set) {
-                       rprintf(FINFO,
-                               "%sing the %s option to match the batchfile.\n",
-                               set ? "Sett" : "Clear", flag_name[i]);
+                       if (verbose) {
+                               rprintf(FINFO,
+                                       "%sing the %s option to match the batchfile.\n",
+                                       set ? "Sett" : "Clear", flag_name[i]);
+                       }
                        *flag_ptr[i] = set;
                }
        }
@@ -95,19 +96,16 @@ static void write_arg(int fd, char *arg)
        write(fd, arg, strlen(arg));
 }
 
-static void write_excludes(int fd)
+static void write_filter_rules(int fd)
 {
-       struct exclude_struct *ent;
+       struct filter_struct *ent;
 
        write_sbuf(fd, " <<'#E#'\n");
-       for (ent = exclude_list.head; ent; ent = ent->next) {
-               char *p = ent->pattern;
-               if (ent->match_flags & MATCHFLG_INCLUDE)
-                       write_buf(fd, "+ ", 2);
-               else if (((*p == '-' || *p == '+') && p[1] == ' ')
-                   || *p == '#' || *p == ';')
-                       write_buf(fd, "- ", 2);
-               write_sbuf(fd, p);
+       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');
@@ -138,17 +136,26 @@ 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)
-               write_sbuf(fd, " --exclude-from=-");
+       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 (strcmp(p, "-f") == 0) {
+                       i++;
+                       continue;
+               }
                write(fd, " ", 1);
                if (strncmp(p, "--write-batch", 13) == 0) {
                        write(fd, "--read-batch", 12);
@@ -167,8 +174,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_filter_rules(fd);
        if (write(fd, "\n", 1) != 1 || close(fd) < 0) {
                rsyserr(FERROR, errno, "Batch file %s write error", filename);
                exit_cleanup(1);