[SCM] The rsync repository. - branch master updated
Rsync CVS commit messages
rsync-cvs at lists.samba.org
Sun Jan 19 16:24:21 MST 2014
The branch, master has been updated
via 72e7fb5 Mention the latest NEWS items.
via 740551d Undo the hard-link xattr optimization in 78286a03.
from a106ed7 Fix the leaving of a temp file w/o partial-file saving. Fixed bug 10350.
;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 72e7fb5b920c61b259f20a7ef40a3a21bd21214d
Author: Wayne Davison <wayned at samba.org>
Date: Sun Jan 19 15:24:07 2014 -0800
Mention the latest NEWS items.
commit 740551d6576f28b42bc53c3e7e7e150adafa20e4
Author: Wayne Davison <wayned at samba.org>
Date: Sun Jan 19 14:59:43 2014 -0800
Undo the hard-link xattr optimization in 78286a03.
I'm backing out the xattr optimization that was put in to try
to make xattr data sending more optimal on hard-linked files.
The code was causing hard-to-reproduce bugs, and it's better to
get things done fully & correctly over fully optimally.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
generator.c | 4 +---
receiver.c | 6 ++----
sender.c | 3 +--
4 files changed, 54 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/NEWS b/NEWS
index 32bec28..f7bac86 100644
--- a/NEWS
+++ b/NEWS
@@ -4,4 +4,54 @@ Changes since 3.1.0:
BUG FIXES:
+ - Fix a failure to remove our partial-transfer temp file when interrupted
+ (and not saving partial files).
+
+ - Change the chown/group/xattr-set order to avoid losing some
+ security-related xattr info (that is cleared on chown).
+
+ - Fixed a bug in the early daemon protocol where a timeout failed to be
+ honored (e.g. if the remote side fails to send us the initial protocol
+ greeting).
+
+ - Fixed unintended inclusion of commas in file numbers in the daemon log.
+
+ - We once again send the 'f' sub-flag (of -e) to the server side so it
+ knows that we can handle incremental-recusion directory errors properly.
+
+ - Fixed an issue with too-agressive keep-alive messages causing a problem
+ for older rsync versions early in the transfer.
+
+ - Fix incorrect --dry-run backup-directory-creation messages when the
+ backup dir is not an absolute path.
+
+ - Fix a bug where a failed deletion might not affect the exit code.
+
+ - Fix a bug that caused a failure when combining --delete-missing-args with
+ --xattrs and/or --acls.
+
+ - Fixed an itemize bug that affected the combo of --link-dest, -X, and -n.
+
+ - Fixed a problem with delete messages not appearing in the log file when
+ the user didn't use --verbose.
+
+ - Improve chunked xattr reading for OS X.
+
+ - Remove an attempted hard-link xattr optimization that was causing a
+ transfer failure. (If you need to interact with an rsync 3.1.0 using
+ --hard-links & --xattrs, you can specify --protocol=30.)
+
+ - Return an error if a buffer overflows in do_mknod().
+
+ - Fixed a problem reading more than 16 ACLs on some OSes.
+
+ - Try to speed up cygwin by switching back to using socketpair "pipes".
+
- Added knowledge of a few new options to rrsync.
+
+ ENHANCEMENTS:
+
+ - Added the support/rsync-no-vanished wrapper script.
+
+ - Have configure more prominently mention when we failed to find yodl (in
+ case the user wants to be able to generate manpages from *.yo files).
diff --git a/generator.c b/generator.c
index b2ca2e0..0f77481 100644
--- a/generator.c
+++ b/generator.c
@@ -550,9 +550,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
#ifdef SUPPORT_XATTRS
if (preserve_xattrs && do_xfers
&& iflags & (ITEM_REPORT_XATTR|ITEM_TRANSFER)) {
- int fd = iflags & ITEM_REPORT_XATTR
- && (protocol_version < 31 || !BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE))
- ? sock_f_out : -1;
+ int fd = iflags & ITEM_REPORT_XATTR ? sock_f_out : -1;
send_xattr_request(NULL, file, fd);
}
#endif
diff --git a/receiver.c b/receiver.c
index 1e064d9..48540d2 100644
--- a/receiver.c
+++ b/receiver.c
@@ -580,16 +580,14 @@ int recv_files(int f_in, int f_out, char *local_name)
rprintf(FINFO, "recv_files(%s)\n", fname);
#ifdef SUPPORT_XATTRS
- if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
- && (protocol_version < 31 || !BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers)
recv_xattr_request(file, f_in);
#endif
if (!(iflags & ITEM_TRANSFER)) {
maybe_log_item(file, iflags, itemizing, xname);
#ifdef SUPPORT_XATTRS
- if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
- && !BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE))
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers)
set_file_attrs(fname, file, NULL, fname, 0);
#endif
if (iflags & ITEM_IS_NEW) {
diff --git a/sender.c b/sender.c
index 12242ab..5ecb6ea 100644
--- a/sender.c
+++ b/sender.c
@@ -177,8 +177,7 @@ static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
if (iflags & ITEM_XNAME_FOLLOWS)
write_vstring(f_out, buf, len);
#ifdef SUPPORT_XATTRS
- if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
- && (protocol_version < 31 || !BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers)
send_xattr_request(fname, file, f_out);
#endif
}
--
The rsync repository.
More information about the rsync-cvs
mailing list