The branch, master has been updated via c529782a Fix compiling without ftruncate. via 2dfd4849 fix man page typo from a6bdf313 Unset DISPLAY in environment.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit c529782a8d272c54642ed317ee9807dab7c1f06d Author: Wayne Davison <wa...@opencoder.net> Date: Sat Jun 26 12:10:08 2021 -0700 Fix compiling without ftruncate. commit 2dfd48492e96a230e9cc1010df69f9616017b5f9 Author: juleslagarde <23563133+juleslaga...@users.noreply.github.com> Date: Thu Jun 17 07:39:45 2021 +0200 fix man page typo Fix a copy/paste error that should be referring to deletions. ----------------------------------------------------------------------- Summary of changes: rsync.1.md | 2 +- util1.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/rsync.1.md b/rsync.1.md index fbbfad22..ec55a688 100644 --- a/rsync.1.md +++ b/rsync.1.md @@ -2852,7 +2852,7 @@ your home directory (remove the '=' for that). sense) were created (as opposed to updated). The total count will be followed by a list of counts by filetype (if the total is non-zero). - `Number of deleted files` is the count of how many "files" (generic - sense) were created (as opposed to updated). The total count will be + sense) were deleted. The total count will be followed by a list of counts by filetype (if the total is non-zero). Note that this line is only output if deletions are in effect, and only if protocol 31 is being used (the default for rsync 3.1.x). diff --git a/util1.c b/util1.c index b2b19892..0daf9b04 100644 --- a/util1.c +++ b/util1.c @@ -406,10 +406,15 @@ int copy_file(const char *source, const char *dest, int ofd, mode_t mode) /* Source file might have shrunk since we fstatted it. * Cut off any extra preallocated zeros from dest file. */ - if (offset < prealloc_len && do_ftruncate(ofd, offset) < 0) { + if (offset < prealloc_len) { +#ifdef HAVE_FTRUNCATE /* If we fail to truncate, the dest file may be wrong, so we * must trigger the "partial transfer" error. */ - rsyserr(FERROR_XFER, errno, "ftruncate %s", full_fname(dest)); + if (do_ftruncate(ofd, offset) < 0) + rsyserr(FERROR_XFER, errno, "ftruncate %s", full_fname(dest)); +#else + rprintf(FERROR_XFER, "no ftruncate for over-long pre-alloc: %s", full_fname(dest)); +#endif } if (close(ofd) < 0) { -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs