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
Separate the dirs from the files in xattrs.text.
[rsync/rsync.git]
/
rsync.c
diff --git
a/rsync.c
b/rsync.c
index
91fb9e3
..
17ce76a
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-495,7
+495,7
@@
int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
flags |= ATTRS_SKIP_MTIME;
if (!(flags & ATTRS_SKIP_MTIME)
&& cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
flags |= ATTRS_SKIP_MTIME;
if (!(flags & ATTRS_SKIP_MTIME)
&& cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
- int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file),
file->
mode);
+ int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file),
sxp->st.st_
mode);
if (ret < 0) {
rsyserr(FERROR_XFER, errno, "failed to set times on %s",
full_fname(fname));
if (ret < 0) {
rsyserr(FERROR_XFER, errno, "failed to set times on %s",
full_fname(fname));
@@
-510,7
+510,7
@@
int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
&& sxp->st.st_gid != (gid_t)F_GROUP(file);
change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
&& sxp->st.st_gid != (gid_t)F_GROUP(file);
-#if
!defined HAVE_LCHOWN && !defined CHOWN_MODIFIES
_SYMLINK
+#if
ndef CAN_CHOWN
_SYMLINK
if (S_ISLNK(sxp->st.st_mode)) {
;
} else
if (S_ISLNK(sxp->st.st_mode)) {
;
} else