Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If the --partial-dir value is an absolute path and we use a file in
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
0bb4e9f
..
c11672f
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-657,8
+657,8
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
match_level = 0;
}
match_level = 0;
}
-#ifdef HAVE_LINK
if (match_level == 3 && !copy_dest) {
if (match_level == 3 && !copy_dest) {
+#ifdef SUPPORT_HARD_LINKS
if (link_dest) {
if (hard_link_one(file, ndx, fname, 0, stp,
cmpbuf, 1,
if (link_dest) {
if (hard_link_one(file, ndx, fname, 0, stp,
cmpbuf, 1,
@@
-667,7
+667,9
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
goto try_a_copy;
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
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
itemize(file, ndx, 0, stp, 0, 0, NULL);
if (verbose > 1 && maybe_ATTRS_REPORT) {
code = daemon_log_format_has_i || dry_run
@@
-676,7
+678,6
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
}
return -2;
}
}
return -2;
}
-#endif
if (match_level >= 2) {
try_a_copy: /* Copy the file locally. */
if (match_level >= 2) {
try_a_copy: /* Copy the file locally. */
@@
-740,9
+741,10
@@
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
} else {
rprintf(FERROR,
"internal: try_dests_non() called with invalid mode (%o)\n",
} else {
rprintf(FERROR,
"internal: try_dests_non() called with invalid mode (%o)\n",
- file->mode);
+
(int)
file->mode);
exit_cleanup(RERR_UNSUPPORTED);
}
exit_cleanup(RERR_UNSUPPORTED);
}
+#ifdef SUPPORT_HARD_LINKS
if (link_dest
#ifndef CAN_HARDLINK_SYMLINK
&& !S_ISLNK(file->mode)
if (link_dest
#ifndef CAN_HARDLINK_SYMLINK
&& !S_ISLNK(file->mode)
@@
-760,6
+762,7
@@
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
}
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);
if (itemizing && log_format_has_i && verbose > 1) {
int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE
+ (link_dest ? ITEM_XNAME_FOLLOWS : 0);