X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b32fd63459f11d12de8b9cd94deab4a792f2af74..8484ddd3d1e667eb209328c17c389972adc4f14a:/receiver.c diff --git a/receiver.c b/receiver.c index d5a338cc..ba3566b8 100644 --- a/receiver.c +++ b/receiver.c @@ -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));