- Got rid of the iflag kluge for 2.6.4pre3.

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 093d309..a738b42 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -20,7 +20,7 @@
 #include "rsync.h"
 
 extern int verbose;
-extern int dry_run;
+extern int do_xfers;
 extern int am_server;
 extern int am_daemon;
 extern int log_before_transfer;
@@ -34,6 +34,8 @@ extern int updating_basis_file;
 extern int make_backups;
 extern int do_progress;
 extern int inplace;
+extern int batch_fd;
+extern int write_batch;
 extern struct stats stats;
 extern struct file_list *the_file_list;
 extern char *log_format;
@@ -173,18 +175,6 @@ int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
        }
        *len_ptr = len;
 
-       /* XXX Temporary rejection of 2.6.4pre1 & pre2 */
-       if (iflags & ITEM_DUMMY_BIT) {
-               extern int am_sender;
-               if (!am_sender || !(iflags & (ITEM_LOCAL_CHANGE|ITEM_TRANSFER))) {
-                       rprintf(FERROR,
-                               "The %s side is running 2.6.4pre[12] -- upgrade it or use --protocol=28!\n",
-                               am_sender ? "receiving" : "sending");
-                       exit_cleanup(RERR_PROTOCOL);
-               }
-               iflags &= ~ITEM_DUMMY_BIT;
-       } /* XXX */
-
        if (iflags & ITEM_TRANSFER) {
                if (!S_ISREG(the_file_list->files[ndx]->mode)) {
                        rprintf(FERROR,
@@ -216,6 +206,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        int save_make_backups = make_backups;
        int itemizing = am_daemon ? daemon_log_format_has_i
                      : !am_server && log_format_has_i;
+       int f_xfer = write_batch < 0 ? batch_fd : f_out;
        int i, j;
 
        if (verbose > 2)
@@ -274,7 +265,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                stats.num_transferred_files++;
                stats.total_transferred_size += file->length;
 
-               if (dry_run) { /* log the transfer */
+               if (!do_xfers) { /* log the transfer */
                        if (!am_server && log_format)
                                log_item(file, &stats, iflags, NULL);
                        write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
@@ -331,7 +322,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
                                    xname, xlen);
-               write_sum_head(f_out, s);
+               write_sum_head(f_xfer, s);
 
                if (verbose > 2) {
                        rprintf(FINFO, "calling match_sums %s\n",
@@ -345,7 +336,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                set_compression(fname);
 
-               match_sums(f_out, s, mbuf, st.st_size);
+               match_sums(f_xfer, s, mbuf, st.st_size);
                if (do_progress)
                        end_progress(st.st_size);