char *cmpbuf, STRUCT_STAT *stp, int itemizing,
int maybe_ATTRS_REPORT, enum logcode code)
{
+ int save_ignore_times = ignore_times;
+ int save_size_only = size_only;
int best_match = -1;
int match_level = 0;
int j = 0;
+ /* We can't let these send-affecting options affect our checking
+ * for identical files in the alternate basis dirs. */
+ ignore_times = size_only = 0;
+
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode))
case 2:
if (!unchanged_attrs(file, stp))
continue;
- if ((always_checksum || ignore_times)
+ if (always_checksum
&& cmp_time(stp->st_mtime, file->modtime))
continue;
best_match = j;
break;
} while (basis_dir[++j] != NULL);
+ ignore_times = save_ignore_times;
+ size_only = save_size_only;
+
if (!match_level)
return -1;
match_level = 0;
}
-#ifdef HAVE_LINK
if (match_level == 3 && !copy_dest) {
+#ifdef SUPPORT_HARD_LINKS
if (link_dest) {
if (hard_link_one(file, ndx, fname, 0, stp,
cmpbuf, 1,
goto try_a_copy;
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
- } else if (itemizing)
+ } else
+#endif
+ if (itemizing)
itemize(file, ndx, 0, stp, 0, 0, NULL);
if (verbose > 1 && maybe_ATTRS_REPORT) {
code = daemon_log_format_has_i || dry_run
}
return -2;
}
-#endif
if (match_level >= 2) {
try_a_copy: /* Copy the file locally. */
} else {
rprintf(FERROR,
"internal: try_dests_non() called with invalid mode (%o)\n",
- file->mode);
+ (int)file->mode);
exit_cleanup(RERR_UNSUPPORTED);
}
+#ifdef SUPPORT_HARD_LINKS
if (link_dest
#ifndef CAN_HARDLINK_SYMLINK
&& !S_ISLNK(file->mode)
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
}
+#endif
if (itemizing && log_format_has_i && verbose > 1) {
int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE
+ (link_dest ? ITEM_XNAME_FOLLOWS : 0);
char *dn = file->dirname ? file->dirname : ".";
if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
if (relative_paths && !implied_dirs
- && do_stat(dn, &st) < 0
+ && safe_stat(dn, &st) < 0
&& create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",