A couple minor tweaks.

This commit is contained in:
Wayne Davison
2021-10-13 10:39:44 -07:00
parent 3af00277ee
commit 0f87eafa2f
2 changed files with 10 additions and 8 deletions

View File

@@ -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.")

16
rsync.c
View File

@@ -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)) {