- Fixed a problem with the setting of the --recurse option from the

[rsync/rsync.git] / batch.c

diff --git a/batch.c b/batch.c
index 8a394d2..efc38c3 100644 (file)
--- a/batch.c
+++ b/batch.c
@@ -8,9 +8,10 @@
 #include "rsync.h"
 #include <time.h>
 
-extern char *batch_name;
+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;
@@ -18,17 +19,21 @@ extern int preserve_uid;
 extern int preserve_gid;
 extern int always_checksum;
 extern int protocol_version;
+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
 };
 
@@ -40,6 +45,7 @@ static char *flag_name[] = {
        "--devices (-D)",
        "--hard-links (-H)",
        "--checksum (-c)",
+       "--dirs (-d)",
        NULL
 };
 
@@ -49,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;
@@ -60,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) {
@@ -71,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)
@@ -198,9 +211,9 @@ void show_flist(int index, struct file_struct **fptr)
                if (fptr[i]->dirname)
                        rprintf(FINFO, "flist->dirname=%s\n",
                                fptr[i]->dirname);
-               if (fptr[i]->basedir)
-                       rprintf(FINFO, "flist->basedir=%s\n",
-                               fptr[i]->basedir);
+               if (am_sender && fptr[i]->dir.root)
+                       rprintf(FINFO, "flist->dir.root=%s\n",
+                               fptr[i]->dir.root);
        }
 }