Got rid of the erroneous --dry-run short-circuit in the directory

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 28803c8..b090f66 100644 (file)
--- a/main.c
+++ b/main.c
@@ -59,7 +59,8 @@ extern int filesfrom_fd;
 extern pid_t cleanup_child_pid;
 extern char *files_from;
 extern char *remote_filesfrom_file;
-extern char *compare_dest;
+extern char *partial_dir;
+extern char *basis_dir[];
 extern char *rsync_path;
 extern char *shell_cmd;
 extern char *batch_name;
@@ -463,7 +464,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
        int pid;
        int status = 0;
        int error_pipe[2], name_pipe[2];
-       BOOL need_name_pipe = compare_dest && !dry_run;
+       BOOL need_name_pipe = (basis_dir[0] || partial_dir) && !dry_run;
 
        /* The receiving side mustn't obey this, or an existing symlink that
         * points to an identical file won't be replaced by the referent. */
@@ -540,7 +541,6 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
        generate_files(f_out, flist, local_name, name_pipe[1]);
 
-       get_redo_num(); /* Read final MSG_DONE and any prior messages. */
        report(-1);
        io_flush(FULL_FLUSH);
        if (protocol_version >= 24) {
@@ -671,9 +671,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
        char *local_name = NULL;
 
        cleanup_child_pid = pid;
-       if (read_batch) {
-               assert(am_sender == 0);
-       } else {
+       if (!read_batch) {
                set_nonblocking(f_in);
                set_nonblocking(f_out);
        }