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
Changed the test for the 2.6.8 bug to preserve owner and group.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
a53bb64
..
55f0e4a
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-1238,7
+1238,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
#ifdef SUPPORT_HARD_LINKS
}
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_
NOT_HLINK
_FIRST(file)
+ if (preserve_hard_links && F_
HLINK_NOT
_FIRST(file)
&& hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
return;
#endif
&& hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
return;
#endif
@@
-1297,7
+1297,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
statret = 1;
}
#ifdef SUPPORT_HARD_LINKS
statret = 1;
}
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_
NOT_HLINK
_LAST(file))
+ if (preserve_hard_links && F_
HLINK_NOT
_LAST(file))
return;
#endif
if (do_symlink(sl, fname) != 0) {
return;
#endif
if (do_symlink(sl, fname) != 0) {
@@
-1374,7
+1374,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
statret = 1;
}
#ifdef SUPPORT_HARD_LINKS
statret = 1;
}
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_
NOT_HLINK
_LAST(file))
+ if (preserve_hard_links && F_
HLINK_NOT
_LAST(file))
return;
#endif
if (verbose > 2) {
return;
#endif
if (verbose > 2) {
@@
-1494,7
+1494,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (statret != 0) {
#ifdef SUPPORT_HARD_LINKS
if (statret != 0) {
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_
NOT_HLINK
_LAST(file))
+ if (preserve_hard_links && F_
HLINK_NOT
_LAST(file))
return;
#endif
if (stat_errno == ENOENT)
return;
#endif
if (stat_errno == ENOENT)
@@
-1557,7
+1557,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
pretend_missing:
/* pretend the file didn't exist */
#ifdef SUPPORT_HARD_LINKS
pretend_missing:
/* pretend the file didn't exist */
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && F_
NOT_HLINK
_LAST(file))
+ if (preserve_hard_links && F_
HLINK_NOT
_LAST(file))
return;
#endif
statret = real_ret = -1;
return;
#endif
statret = real_ret = -1;