The branch, master has been updated
via 0f87eafa A couple minor tweaks.
from 3af00277 We need stat memcpy.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0f87eafa2fa2379901762b8aa133f7074dbb2c0e
Author: Wayne Davison <wa...@opencoder.net>
Date: Wed Oct 13 10:39:44 2021 -0700
A couple minor tweaks.
-----------------------------------------------------------------------
Summary of changes:
packaging/release-rsync | 2 +-
rsync.c | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/release-rsync b/packaging/release-rsync
index f7cfcfe5..fa1da234 100755
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -53,7 +53,7 @@ def main():
doc_prefix = line.split('=')[1].strip()
if doc_prefix != '/usr':
warn(f"*** The documentation was built with prefix
{doc_prefix} instead of /usr ***")
- warn("*** Read the md2man script for a way to override
this. ***\n")
+ die("*** Read the md2man script for a way to override
this. ***")
break
if line.startswith('.P'):
die("Failed to find the prefix comment at the start of the
rsync.1 manpage.")
diff --git a/rsync.c b/rsync.c
index 7c821986..60029c2d 100644
--- a/rsync.c
+++ b/rsync.c
@@ -580,13 +580,15 @@ int set_file_attrs(const char *fname, struct file_struct
*file, stat_x *sxp,
if ((omit_dir_times && S_ISDIR(sxp->st.st_mode))
|| (omit_link_times && S_ISLNK(sxp->st.st_mode)))
flags |= ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME |
ATTRS_SKIP_CRTIME;
- if (!preserve_mtimes)
- flags |= ATTRS_SKIP_MTIME;
- if (!atimes_ndx || S_ISDIR(sxp->st.st_mode))
- flags |= ATTRS_SKIP_ATIME;
- /* Don't set the creation date on the root folder of an HFS+ volume. */
- if (sxp->st.st_ino == 2 && S_ISDIR(sxp->st.st_mode))
- flags |= ATTRS_SKIP_CRTIME;
+ else {
+ if (!preserve_mtimes)
+ flags |= ATTRS_SKIP_MTIME;
+ if (!atimes_ndx || S_ISDIR(sxp->st.st_mode))
+ flags |= ATTRS_SKIP_ATIME;
+ /* Don't set the creation date on the root folder of an HFS+
volume. */
+ if (sxp->st.st_ino == 2 && S_ISDIR(sxp->st.st_mode))
+ flags |= ATTRS_SKIP_CRTIME;
+ }
if (sxp != &sx2)
memcpy(&sx2.st, &sxp->st, sizeof sx2.st);
if (!(flags & ATTRS_SKIP_MTIME) && !same_mtime(file, &sxp->st, flags &
ATTRS_ACCURATE_TIME)) {
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
