Tweaked some whitespace to match the latest version from autoconf.

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index a738b42..76546f1 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -27,7 +27,9 @@ extern int log_before_transfer;
 extern int log_format_has_i;
 extern int daemon_log_format_has_i;
 extern int csum_length;
+extern int append_mode;
 extern int io_error;
+extern int allowed_lull;
 extern int protocol_version;
 extern int remove_sent_files;
 extern int updating_basis_file;
@@ -56,6 +58,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)))
@@ -70,6 +73,13 @@ static struct sum_struct *receive_sums(int f)
                        (double)s->count, (long)s->blength, (long)s->remainder);
        }
 
+       if (append_mode) {
+               s->flength = (OFF_T)s->count * s->blength;
+               if (s->remainder)
+                       s->flength -= s->blength - s->remainder;
+               return s;
+       }
+
        if (s->count == 0)
                return(s);
 
@@ -89,6 +99,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",
@@ -120,11 +133,9 @@ void successful_send(int ndx)
                                    file->dir.root, "/", NULL);
        } else
                offset = 0;
-       f_name_to(file, fname + offset);
-       if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1) {
-               rprintf(FINFO, "sender removed %s\n",
-                       safe_fname(fname + offset));
-       }
+       f_name(file, fname + offset);
+       if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1)
+               rprintf(FINFO, "sender removed %s\n", fname + offset);
 }
 
 static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
@@ -226,6 +237,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        /* For inplace: redo phase turns off the backup
                         * flag so that we do a regular inplace send. */
                        make_backups = 0;
+                       append_mode = 0;
                        continue;
                }
 
@@ -242,7 +254,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                                fname[offset++] = '/';
                } else
                        offset = 0;
-               fname2 = f_name_to(file, fname + offset);
+               fname2 = f_name(file, fname + offset);
 
                if (verbose > 2)
                        rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
@@ -317,22 +329,20 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                if (verbose > 2) {
                        rprintf(FINFO, "send_files mapped %s of size %.0f\n",
-                               safe_fname(fname), (double)st.st_size);
+                               fname, (double)st.st_size);
                }
 
                write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
                                    xname, xlen);
                write_sum_head(f_xfer, s);
 
-               if (verbose > 2) {
-                       rprintf(FINFO, "calling match_sums %s\n",
-                               safe_fname(fname));
-               }
+               if (verbose > 2)
+                       rprintf(FINFO, "calling match_sums %s\n", fname);
 
                if (log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);
                else if (!am_server && verbose && do_progress)
-                       rprintf(FINFO, "%s\n", safe_fname(fname2));
+                       rprintf(FINFO, "%s\n", fname2);
 
                set_compression(fname);
 
@@ -356,10 +366,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                free_sums(s);
 
-               if (verbose > 2) {
-                       rprintf(FINFO, "sender finished %s\n",
-                               safe_fname(fname));
-               }
+               if (verbose > 2)
+                       rprintf(FINFO, "sender finished %s\n", fname);
 
                /* Flag that we actually sent this entry. */
                file->flags |= FLAG_SENT;