- Moved read_sum_head() to io.c (because the generator uses it too).

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index c5dffc1..f31176e 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -27,6 +27,7 @@ extern int dry_run;
 extern int am_server;
 extern int am_daemon;
 extern int protocol_version;
+extern int make_backups;
 extern struct stats stats;
 
 
@@ -37,22 +38,6 @@ extern struct stats stats;
  * and transmits them to the receiver.  The sender process runs on the
  * machine holding the source files.
  **/
-void read_sum_head(int f, struct sum_struct *sum)
-{
-       sum->count = read_int(f);
-       sum->blength = read_int(f);
-       if (protocol_version < 27) {
-               sum->s2length = csum_length;
-       } else {
-               sum->s2length = read_int(f);
-               if (sum->s2length > MD4_SUM_LENGTH) {
-                       rprintf(FERROR, "Invalid checksum length %ld\n",
-                           (long)sum->s2length);
-                       exit_cleanup(RERR_PROTOCOL);
-               }
-       }
-       sum->remainder = read_int(f);
-}
 
 /**
  * Receive the checksums for a buffer
@@ -71,8 +56,8 @@ static struct sum_struct *receive_sums(int f)
        s->sums = NULL;
 
        if (verbose > 3) {
-               rprintf(FINFO, "count=%ld n=%u rem=%u\n",
-                       (long)s->count, s->blength, s->remainder);
+               rprintf(FINFO, "count=%.0f n=%ld rem=%ld\n",
+                       (double)s->count, (long)s->blength, (long)s->remainder);
        }
 
        if (s->count == 0)
@@ -120,6 +105,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        struct file_struct *file;
        int phase = 0;
        struct stats initial_stats;
+       int save_make_backups = make_backups;
        int j;
 
        if (verbose > 2)
@@ -136,6 +122,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                                write_int(f_out, -1);
                                if (verbose > 2)
                                        rprintf(FINFO, "send_files phase=%d\n", phase);
+                               /* For inplace: redo phase turns off the backup
+                                * flag so that we do a regular inplace send. */
+                               make_backups = 0;
                                continue;
                        }
                        break;
@@ -208,7 +197,11 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        return;
                }
 
-               mbuf = st.st_size ? map_file(fd, st.st_size, s->blength) : NULL;
+               if (st.st_size) {
+                       int32 read_size = MAX(s->blength * 3, MAX_MAP_SIZE);
+                       mbuf = map_file(fd, st.st_size, read_size, s->blength);
+               } else
+                       mbuf = NULL;
 
                if (verbose > 2) {
                        rprintf(FINFO, "send_files mapped %s of size %.0f\n",
@@ -249,6 +242,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                                safe_fname(fname));
                }
        }
+       make_backups = save_make_backups;
 
        if (verbose > 2)
                rprintf(FINFO, "send files finished\n");