Added the --append option.

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index be9e56f..00b60c9 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;
@@ -28,12 +28,15 @@ extern int log_format_has_i;
 extern int daemon_log_format_has_i;
 extern int csum_length;
 extern int io_error;
+extern int allowed_lull;
 extern int protocol_version;
 extern int remove_sent_files;
 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;
@@ -54,6 +57,7 @@ static struct sum_struct *receive_sums(int f)
 {
        struct sum_struct *s;
        int32 i;
+       int lull_mod = allowed_lull * 5;
        OFF_T offset = 0;
 
        if (!(s = new(struct sum_struct)))
@@ -87,6 +91,9 @@ static struct sum_struct *receive_sums(int f)
                        s->sums[i].len = s->blength;
                offset += s->sums[i].len;
 
+               if (allowed_lull && !(i % lull_mod))
+                       maybe_send_keepalive();
+
                if (verbose > 3) {
                        rprintf(FINFO,
                                "chunk[%d] len=%d offset=%.0f sum1=%08x\n",
@@ -146,7 +153,6 @@ int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
        uchar fnamecmp_type = FNAMECMP_FNAME;
        int iflags = protocol_version >= 29 ? read_shortint(f_in)
                   : ITEM_TRANSFER | ITEM_MISSING_DATA;
-       int isave = iflags; /* XXX remove soon */
 
        /* Handle the new keep-alive (no-op) packet. */
        if (ndx == the_file_list->count && iflags == ITEM_IS_NEW)
@@ -174,13 +180,6 @@ int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
        }
        *len_ptr = len;
 
-       /* XXX Temporary backward compatibility when talking to 2.6.4pre[12] */
-       if (protocol_version >= 29 && iflags & ITEM_TRANSFER
-           && !S_ISREG(the_file_list->files[ndx]->mode)) {
-               iflags &= ~ITEM_TRANSFER;
-               iflags |= ITEM_LOCAL_CHANGE;
-       }
-
        if (iflags & ITEM_TRANSFER) {
                if (!S_ISREG(the_file_list->files[ndx]->mode)) {
                        rprintf(FERROR,
@@ -189,7 +188,7 @@ int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
                        exit_cleanup(RERR_PROTOCOL);
                }
        } else if (f_out >= 0) {
-               write_ndx_and_attrs(f_out, ndx, isave /*XXX iflags */,
+               write_ndx_and_attrs(f_out, ndx, iflags,
                                    fnamecmp_type, buf, len);
        }
 
@@ -207,11 +206,12 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        uchar fnamecmp_type;
        int iflags, xlen;
        struct file_struct *file;
-       int phase = 0;
+       int phase = 0, max_phase = protocol_version >= 29 ? 2 : 1;
        struct stats initial_stats;
        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)
@@ -222,9 +222,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                i = read_int(f_in);
                if (i == -1) {
-                       if (phase)
+                       if (++phase > max_phase)
                                break;
-                       phase = 1;
                        csum_length = SUM_LENGTH;
                        if (verbose > 2)
                                rprintf(FINFO, "send_files phase=%d\n", phase);
@@ -257,6 +256,12 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        maybe_log_item(file, iflags, itemizing, xname);
                        continue;
                }
+               if (phase == 2) {
+                       rprintf(FERROR,
+                               "got transfer request in phase 2 [%s]\n",
+                               who_am_i());
+                       exit_cleanup(RERR_PROTOCOL);
+               }
 
                updating_basis_file = inplace && (protocol_version >= 29
                        ? fnamecmp_type == FNAMECMP_FNAME : !make_backups);
@@ -265,7 +270,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,
@@ -322,7 +327,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",
@@ -336,7 +341,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);