A couple comment tweaks.

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index 861895e..ba3566b 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -228,7 +228,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
                sum.flength = (OFF_T)sum.count * sum.blength;
                if (sum.remainder)
                        sum.flength -= sum.blength - sum.remainder;
-               if (append_mode == 2) {
+               if (append_mode == 2 && mapbuf) {
                        for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
                                if (INFO_GTE(PROGRESS, 1))
                                        show_progress(offset, total_size);
@@ -285,8 +285,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
 
                if (DEBUG_GTE(DELTASUM, 3)) {
                        rprintf(FINFO,
-                               "chunk[%d] of size %ld at %s offset=%s\n",
-                               i, (long)len, big_num(offset2), big_num(offset));
+                               "chunk[%d] of size %ld at %s offset=%s%s\n",
+                               i, (long)len, big_num(offset2), big_num(offset),
+                               updating_basis_or_equiv && offset == offset2 ? " (seek)" : "");
                }
 
                if (mapbuf) {
@@ -321,8 +322,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
                goto report_write_error;
 
 #ifdef HAVE_FTRUNCATE
-       if (inplace && fd != -1
-        && ftruncate(fd, offset) < 0) {
+       if (inplace && fd != -1 && do_ftruncate(fd, offset) < 0) {
                rsyserr(FERROR_XFER, errno, "ftruncate failed on %s",
                        full_fname(fname));
        }
@@ -331,7 +331,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
        if (INFO_GTE(PROGRESS, 1))
                end_progress(total_size);
 
-       if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
+       if (fd != -1 && offset > 0 && sparse_end(fd, offset) != 0) {
            report_write_error:
                rsyserr(FERROR_XFER, errno, "write failed on %s",
                        full_fname(fname));