<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/117968ef4391653b839790af2b924baa3e7d19ea">https://github.com/macports/macports-ports/commit/117968ef4391653b839790af2b924baa3e7d19ea</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 117968e remove unused patches
</span>117968e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 117968ef4391653b839790af2b924baa3e7d19ea
</span>Author: jabenninghoff <jbenninghoff@mac.com>
AuthorDate: Sun Feb 11 11:39:46 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> remove unused patches
</span>---
net/rsync/Portfile | 2 +-
net/rsync/files/patch-hfs-compression-options.diff | 33 -
net/rsync/files/patch-hfs-compression.diff | 810 ---------------------
3 files changed, 1 insertion(+), 844 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/rsync/Portfile b/net/rsync/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2166cbd..b15cb55 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/rsync/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/rsync/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ depends_lib port:popt port:libiconv
</span> # these come from http://rsync.samba.org/ftp/rsync/rsync-patches-3.1.3.tar.gz
# and need to be updated with each release
# hfs-compression.diff is marked by upstream as broken as of 3.1.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# don't use: patch-hfs-compression.diff patch-hfs-compression-options.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# removed: patch-hfs-compression.diff patch-hfs-compression-options.diff
</span> patchfiles patch-fileflags.diff \
patch-crtimes.diff \
patch-acls-unpack-error.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/rsync/files/patch-hfs-compression-options.diff b/net/rsync/files/patch-hfs-compression-options.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a37065b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/rsync/files/patch-hfs-compression-options.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/options.c b/options.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/options.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/options.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -577,6 +577,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char const *iconv = "no ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char const *ipv6 = "no ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char const *fileflags = "no ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char const *hfscomp = "no";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STRUCT_STAT *dumstat;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if SUBPROTOCOL_VERSION != 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -616,6 +617,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fileflags = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hfscomp = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rprintf(f, "%s version %s protocol version %d%s\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -629,8 +633,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (int)(sizeof (int64) * 8));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- got_socketpair, hardlinks, links, ipv6, have_inplace);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sprealloc, %sfile-flags\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sprealloc, %sfile-flags,\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_inplace, acls, xattrs, iconv, symtimes, prealloc, fileflags);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rprintf(f, " %sHFS-compression\n",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hfscomp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef MAINTAINER_MODE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/rsync/files/patch-hfs-compression.diff b/net/rsync/files/patch-hfs-compression.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c9ed278..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/rsync/files/patch-hfs-compression.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,810 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This patch adds support for HFS+ compression.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Written by Mike Bombich. Taken from http://www.bombich.com/rsync.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Modified by Wayne to fix some issues and tweak the implementation a bit.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This compiles on OS X and passes the testsuite, but otherwise UNTESTED!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-To use this patch, run these commands for a successful build:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch -p1 <patches/fileflags.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch -p1 <patches/crtimes.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch -p1 <patches/hfs-compression.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./prepare-source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-TODO:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - Should rsync try to treat the compressed data as file data and use the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rsync algorithm on the data transfer?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-based-on: patch/master/crtimes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/flist.c b/flist.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/flist.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/flist.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1583,6 +1583,9 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef SUPPORT_XATTRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (preserve_xattrs) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sx.st.st_mode = file->mode;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preserve_fileflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sx.st.st_flags = F_FFLAGS(file);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sx.st.st_mtime = file->modtime; /* get_xattr needs mtime for decmpfs xattrs */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (get_xattr(fname, &sx) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- io_error |= IOERR_GENERAL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/generator.c b/generator.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/generator.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/generator.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,6 +37,7 @@ extern int implied_dirs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int keep_dirlinks;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int preserve_acls;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int preserve_xattrs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern int preserve_hfs_compression;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int preserve_links;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int preserve_devices;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int preserve_specials;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1776,6 +1777,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fname, fnamecmpbuf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sx.st.st_size = F_LENGTH(fuzzy_file);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (sx.st.st_flags & UF_COMPRESSED) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preserve_hfs_compression)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sx.st.st_size = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sx.st.st_flags &= ~UF_COMPRESSED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- statret = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fnamecmp = fnamecmpbuf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1943,6 +1952,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (read_batch)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto cleanup;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (F_FFLAGS(file) & UF_COMPRESSED) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* At this point the attrs have already been copied, we don't need to transfer a data fork
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * If my filesystem doesn't support HFS compression, the existing file's content
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * will not be automatically truncated, so we'll do that manually here */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preserve_hfs_compression && sx.st.st_size > 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ftruncate(fd, 0) == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sx.st.st_size = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (statret != 0 || whole_file)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write_sum_head(f_out, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (sx.st.st_size <= 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib/sysxattrs.c b/lib/sysxattrs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/sysxattrs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/sysxattrs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,10 +22,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rsync.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "sysxattrs.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern int preserve_hfs_compression;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef SUPPORT_XATTRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_OSX_XATTRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef XATTR_SHOWCOMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define XATTR_SHOWCOMPRESSION 0x0020
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GETXATTR_FETCH_LIMIT (64*1024*1024)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int xattr_options = XATTR_NOFOLLOW;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined HAVE_LINUX_XATTRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +66,12 @@ ssize_t sys_llistxattr(const char *path, char *list, size_t size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ssize_t len = getxattr(path, name, value, size, 0, XATTR_NOFOLLOW);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ssize_t len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preserve_hfs_compression)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xattr_options |= XATTR_SHOWCOMPRESSION;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ len = getxattr(path, name, value, size, 0, xattr_options);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If we're retrieving data, handle resource forks > 64MB specially */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (value != NULL && len == GETXATTR_FETCH_LIMIT && (size_t)len < size) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,7 +79,7 @@ ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t si
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- u_int32_t offset = len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t data_retrieved = len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (data_retrieved < size) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- len = getxattr(path, name, value + offset, size - data_retrieved, offset, XATTR_NOFOLLOW);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ len = getxattr(path, name, value + offset, size - data_retrieved, offset, xattr_options);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (len <= 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data_retrieved += len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,12 +103,16 @@ int sys_lsetxattr(const char *path, const char *name, const void *value, size_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int sys_lremovexattr(const char *path, const char *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return removexattr(path, name, XATTR_NOFOLLOW);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preserve_hfs_compression)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xattr_options |= XATTR_SHOWCOMPRESSION;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return removexattr(path, name, xattr_options);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ssize_t sys_llistxattr(const char *path, char *list, size_t size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return listxattr(path, list, size, XATTR_NOFOLLOW);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preserve_hfs_compression)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xattr_options |= XATTR_SHOWCOMPRESSION;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return listxattr(path, list, size, xattr_options);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif HAVE_FREEBSD_XATTRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/main.c b/main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,6 +29,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/sysctl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/attr.h> /* For getattrlist() */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/mount.h> /* For statfs() */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int dry_run;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int list_only;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,6 +57,7 @@ extern int copy_dirlinks;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int copy_unsafe_links;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int keep_dirlinks;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int preserve_hard_links;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern int preserve_hfs_compression;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int protocol_version;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int force_change;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int file_total;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,6 +113,7 @@ int daemon_over_rsh = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mode_t orig_umask = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int batch_gen_fd = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int sender_keeps_checksum = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int fs_supports_hfs_compression = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* There's probably never more than at most 2 outstanding child processes,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * but set it higher, just in case. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -560,6 +566,43 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0; /* not reached */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void hfs_receiver_check(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct statfs fsb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct attrlist attrs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int32_t len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vol_capabilities_set_t caps;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } attrData;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preserve_hfs_compression != 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return; /* Nothing to check if --hfs-compression option isn't enabled. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (statfs(".", &fsb) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rsyserr(FERROR, errno, "statfs %s failed", curr_dir);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit_cleanup(RERR_FILESELECT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bzero(&attrs, sizeof attrs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attrs.bitmapcount = ATTR_BIT_MAP_COUNT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attrs.volattr = ATTR_VOL_CAPABILITIES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bzero(&attrData, sizeof attrData);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attrData.len = sizeof attrData;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (getattrlist(fsb.f_mntonname, &attrs, &attrData, sizeof attrData, 0) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rsyserr(FERROR, errno, "getattrlist %s failed", curr_dir);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit_cleanup(RERR_FILESELECT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!(attrData.caps[VOL_CAPABILITIES_FORMAT] & VOL_CAP_FMT_DECMPFS_COMPRESSION)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rprintf(FERROR, "The destination filesystem does not support HFS+ compression.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit_cleanup(RERR_UNSUPPORTED);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* The receiving side operates in one of two modes:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * 1. it receives any number of files into a destination directory,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -618,6 +661,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit_cleanup(RERR_FILESELECT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- filesystem_dev = st.st_dev; /* ensures --force works right w/-x */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hfs_receiver_check();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (file_total > 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -678,7 +724,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- full_fname(dest_path));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit_cleanup(RERR_FILESELECT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hfs_receiver_check();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -698,6 +746,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- full_fname(dest_path));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit_cleanup(RERR_FILESELECT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hfs_receiver_check();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *cp = '/';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return cp + 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/options.c b/options.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/options.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/options.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,6 +54,7 @@ int preserve_links = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int preserve_hard_links = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int preserve_acls = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int preserve_xattrs = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int preserve_hfs_compression = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int preserve_perms = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int preserve_fileflags = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int preserve_executability = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -711,6 +712,10 @@ void usage(enum logcode F)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef SUPPORT_XATTRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rprintf(F," -X, --xattrs preserve extended attributes\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rprintf(F," --hfs-compression preserve HFS compression if supported\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rprintf(F," --protect-decmpfs preserve HFS compression as xattrs\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rprintf(F," -o, --owner preserve owner (super-user only)\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rprintf(F," -g, --group preserve group\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rprintf(F," --devices preserve device files (super-user only)\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -972,6 +977,12 @@ static struct poptOption long_options[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"force-uchange", 0, POPT_ARG_VAL, &force_change, USR_IMMUTABLE, 0, 0 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"force-schange", 0, POPT_ARG_VAL, &force_change, SYS_IMMUTABLE, 0, 0 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {"hfs-compression", 0, POPT_ARG_VAL, &preserve_hfs_compression, 1, 0, 0 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {"no-hfs-compression",0, POPT_ARG_VAL, &preserve_hfs_compression, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {"protect-decmpfs", 0, POPT_ARG_VAL, &preserve_hfs_compression, 2, 0, 0 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {"no-protect-decmpfs",0, POPT_ARG_VAL, &preserve_hfs_compression, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 1, 0, 0 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"no-ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1972,6 +1983,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preserve_hfs_compression) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!preserve_xattrs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ preserve_xattrs = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!preserve_fileflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ preserve_fileflags = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (block_size > MAX_BLOCK_SIZE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(err_buf, sizeof err_buf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "--block-size=%lu is too large (max: %u)\n", block_size, MAX_BLOCK_SIZE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2575,6 +2595,11 @@ void server_options(char **args, int *argc_p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (preserve_fileflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- args[ac++] = "--fileflags";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preserve_hfs_compression)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ args[ac++] = preserve_hfs_compression == 1 ? "--hfs-compression" : "--protect-decmpfs";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto oom;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/rsync.c b/rsync.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/rsync.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/rsync.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -573,8 +573,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef SUPPORT_XATTRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (am_root < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_stat_xattr(fname, file, new_mode);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (preserve_xattrs && fnamecmp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preserve_xattrs && fnamecmp) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uint32 tmpflags = sxp->st.st_flags;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sxp->st.st_flags = F_FFLAGS(file); /* set_xattr() needs to check UF_COMPRESSED */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_xattr(fname, file, fnamecmp, sxp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sxp->st.st_flags = tmpflags;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (S_ISDIR(sxp->st.st_mode))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ link_stat(fname, &sx2.st, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!preserve_times
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -585,6 +591,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (sxp->st.st_ino == 2 && S_ISDIR(sxp->st.st_mode))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags |= ATTRS_SKIP_CRTIME;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(flags & ATTRS_SKIP_MTIME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && !(sxp->st.st_flags & UF_COMPRESSED) /* setting this alters mtime, so defer to after set_fileflags */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && (sxp->st.st_mtime != file->modtime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef ST_MTIME_NSEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || (NSEC_BUMP(file) && (uint32)sxp->st.ST_MTIME_NSEC != F_MOD_NSEC(file))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -647,6 +656,16 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && !set_fileflags(fname, fileflags))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto cleanup;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- updated = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), new_mode, fileflags);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ret < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rsyserr(FERROR_XFER, errno, "failed to set times on %s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ full_fname(fname));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ goto cleanup;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ret != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ file->flags |= FLAG_TIME_FAILED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/rsync.h b/rsync.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/rsync.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/rsync.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -549,6 +549,17 @@ typedef unsigned int size_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ST_FLAGS(st) NO_FFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef UF_COMPRESSED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define UF_COMPRESSED 0x00000020
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef VOL_CAP_FMT_DECMPFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define VOL_CAP_FMT_DECMPFS_COMPRESSION 0x00010000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined SUPPORT_XATTRS && defined SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SUPPORT_HFS_COMPRESSION 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Find a variable that is either exactly 32-bits or longer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * If some code depends on 32-bit truncation, it will need to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * take special action in a "#if SIZEOF_INT32 > 4" section. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/rsync.yo b/rsync.yo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/rsync.yo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/rsync.yo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -367,6 +367,8 @@ to the detailed description below for a complete description. verb(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --chmod=CHMOD affect file and/or directory permissions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -A, --acls preserve ACLs (implies -p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -X, --xattrs preserve extended attributes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --hfs-compression preserve HFS compression if supported
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --protect-decmpfs preserve HFS compression as xattrs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -o, --owner preserve owner (super-user only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -g, --group preserve group
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --devices preserve device files (super-user only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1142,6 +1144,42 @@ flags on files and directories that are being updated or deleted on the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- receiving side. It does not try to affect user flags. This option overrides
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bf(--force-change) and bf(--force-uchange).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dit(bf(--hfs-compression)) This option causes rsync to preserve HFS+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+compression if the destination filesystem supports it. If the destination
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+does not support it, rsync will exit with an error.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Filesystem compression was introduced to HFS+ in Mac OS 10.6. A file that is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+compressed has no data in its data fork. Rather, the compressed data is stored
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+in an extended attribute named com.apple.decmpfs and a file flag is set to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+indicate that the file is compressed (UF_COMPRESSED). HFS+ decompresses this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+data "on-the-fly" and presents it to the operating system as a normal file.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Normal attempts to copy compressed files (e.g. in the Finder, via cp, ditto,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+etc.) will copy the file's decompressed contents, remove the UF_COMPRESSED file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+flag, and discard the com.apple.decmpfs extended attribute. This option will
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+preserve the data in the com.apple.decmpfs extended attribute and ignore the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+synthesized data in the file contents.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+This option implies both bf(--fileflags) and (--xattrs).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dit(bf(--protect-decmpfs)) The com.apple.decmpfs extended attribute is hidden
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+by default from list/get xattr calls, therefore normal attempts to copy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+compressed files will functionally decompress those files. While this is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+desirable behavior when copying files to filesystems that do not support HFS+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+compression, it has serious performance and capacity impacts when backing up
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+or restoring the Mac OS X filesystem.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+This option will transfer the com.apple.decmpfs extended attribute regardless
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+of support on the destination. If a source file is compressed and an existing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+file on the destination is not compressed, the data fork of the destination
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+file will be truncated and the com.apple.decmpfs xattr will be transferred
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+instead. Note that compressed files will not be readable to the operating
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+system of the destination if that operating system does not support HFS+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+compression. Once restored (with or without this option) to an operating system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+that supports HFS+ compression, however, these files will be accessible as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+usual.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+This option implies bf(--fileflags) and bf(--xattrs).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dit(bf(--chmod)) This option tells rsync to apply one or more
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- comma-separated "chmod" modes to the permission of the files in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- transfer. The resulting value is treated as though it were the permissions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/t_stub.c b/t_stub.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/t_stub.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/t_stub.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,7 @@ int force_change = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int preserve_acls = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int preserve_times = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int preserve_xattrs = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int preserve_hfs_compression = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *partial_dir;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *module_dir;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- filter_rule_list daemon_filter_list;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/xattrs.c b/xattrs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/xattrs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/xattrs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,6 +33,7 @@ extern int am_generator;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int read_only;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int list_only;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int preserve_xattrs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern int preserve_hfs_compression;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int preserve_links;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int preserve_devices;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int preserve_specials;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,6 +42,10 @@ extern int checksum_seed;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define RSYNC_XAL_INITIAL 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define RSYNC_XAL_LIST_INITIAL 100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GXD_NO_MISSING_ERROR (1<<0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GXD_OMIT_COMPRESSED (1<<1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GXD_FILE_IS_COMPRESSED (1<<2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define MAX_FULL_DATUM 32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HAS_PREFIX(str, prfx) (*(str) == *(prfx) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,6 +78,17 @@ extern int checksum_seed;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define XDEF_ACL_SUFFIX "dacl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define XDEF_ACL_ATTR RSYNC_PREFIX "%" XDEF_ACL_SUFFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define APPLE_PREFIX "com.apple."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define APLPRE_LEN ((int)sizeof APPLE_PREFIX - 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define DECMPFS_SUFFIX "decmpfs"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define RESOURCEFORK_SUFFIX "ResourceFork"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define UNREAD_DATA ((char *)1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAX_DIGEST_LEN < SIZEOF_TIME_T
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#error MAX_DIGEST_LEN is too small to hold an mtime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *datum, *name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t datum_len, name_len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -167,8 +183,7 @@ static ssize_t get_xattr_names(const char *fname)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* On entry, the *len_ptr parameter contains the size of the extra space we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * should allocate when we create a buffer for the data. On exit, it contains
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * the length of the datum. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int no_missing_error)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr, int flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t datum_len = sys_lgetxattr(fname, name, NULL, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t extra_len = *len_ptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -177,7 +192,7 @@ static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *len_ptr = datum_len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (datum_len == (size_t)-1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (errno == ENOTSUP || no_missing_error)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (errno == ENOTSUP || flags & GXD_NO_MISSING_ERROR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rsyserr(FERROR_XFER, errno,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "get_xattr_data: lgetxattr(\"%s\",\"%s\",0) failed",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -185,6 +200,15 @@ static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (flags & GXD_OMIT_COMPRESSED && datum_len > MAX_FULL_DATUM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && HAS_PREFIX(name, APPLE_PREFIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && (strcmp(name+APLPRE_LEN, DECMPFS_SUFFIX) == 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || (flags & GXD_FILE_IS_COMPRESSED && strcmp(name+APLPRE_LEN, RESOURCEFORK_SUFFIX) == 0))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* If we are omitting compress-file-related data, we don't want to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * actually read this data. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return UNREAD_DATA;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!datum_len && !extra_len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extra_len = 1; /* request non-zero amount of memory */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (datum_len + extra_len < datum_len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -213,7 +237,29 @@ static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static int rsync_xal_get(const char *fname, item_list *xalp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void checksum_xattr_data(char *sum, const char *datum, size_t datum_len, stat_x *sxp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (datum == UNREAD_DATA) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* For abbreviated compressed data, we store the file's mtime as the checksum. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SIVAL(sum, 0, sxp->st.st_mtime);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if SIZEOF_TIME_T > 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SIVAL(sum, 4, sxp->st.st_mtime >> 32);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAX_DIGEST_LEN > 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memset(sum + 8, 0, MAX_DIGEST_LEN - 8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAX_DIGEST_LEN > 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memset(sum + 4, 0, MAX_DIGEST_LEN - 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sum_init(checksum_seed);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sum_update(datum, datum_len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sum_end(sum);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static int rsync_xal_get(const char *fname, stat_x *sxp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ssize_t list_len, name_len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t datum_len, name_offset;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -222,7 +268,8 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int user_only = am_sender ? 0 : !am_root;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rsync_xa *rxa;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int count;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int count, flags;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ item_list *xalp = sxp->xattr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* This puts the name list into the "namebuf" buffer. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((list_len = get_xattr_names(fname)) < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -252,20 +299,22 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- datum_len = name_len; /* Pass extra size to get_xattr_data() */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!(ptr = get_xattr_data(fname, name, &datum_len, 0)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ flags = GXD_OMIT_COMPRESSED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preserve_hfs_compression && sxp->st.st_flags & UF_COMPRESSED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ flags |= GXD_FILE_IS_COMPRESSED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!(ptr = get_xattr_data(fname, name, &datum_len, flags)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (datum_len > MAX_FULL_DATUM) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* For large datums, we store a flag and a checksum. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *datum = ptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name_offset = 1 + MAX_DIGEST_LEN;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sum_init(checksum_seed);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sum_update(ptr, datum_len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- free(ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(ptr = new_array(char, name_offset + name_len)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- out_of_memory("rsync_xal_get");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *ptr = XSTATE_ABBREV;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sum_end(ptr + 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checksum_xattr_data(ptr+1, datum, datum_len, sxp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (datum != UNREAD_DATA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ free(datum);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name_offset = datum_len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -311,7 +360,7 @@ int get_xattr(const char *fname, stat_x *sxp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (IS_MISSING_FILE(sxp->st))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (rsync_xal_get(fname, sxp->xattr) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (rsync_xal_get(fname, sxp) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free_xattr(sxp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -346,6 +395,8 @@ int copy_xattrs(const char *source, const char *dest)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- datum_len = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(ptr = get_xattr_data(source, name, &datum_len, 0)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ptr == UNREAD_DATA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ continue; /* XXX Is this right? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (sys_lsetxattr(dest, name, ptr, datum_len) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int save_errno = errno ? errno : EINVAL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rsyserr(FERROR_XFER, errno,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -362,6 +413,10 @@ int copy_xattrs(const char *source, const char *dest)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int find_matching_xattr(item_list *xalp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_OSX_XATTRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xalp = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return -1; /* find_matching_xattr is a waste of cycles for MOSX clients */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t i, j;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- item_list *lst = rsync_xal_l.items;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -395,6 +450,7 @@ static int find_matching_xattr(item_list *xalp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Store *xalp on the end of rsync_xal_l */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -574,11 +630,13 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Re-read the long datum. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(ptr = get_xattr_data(fname, rxa->name, &len, 0))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rprintf(FERROR_XFER, "failed to re-read xattr %s for %s\n", rxa->name, fname);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (errno != ENOTSUP && errno != ENOATTR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rprintf(FERROR_XFER, "failed to re-read xattr %s for %s\n", rxa->name, fname);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write_varint(f_out, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert(ptr != UNREAD_DATA);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write_varint(f_out, len); /* length might have changed! */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write_bigbuf(f_out, ptr, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -795,7 +853,7 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int user_only = am_root <= 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t name_len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int ret = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int flags, ret = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* This puts the current name list into the "namebuf" buffer. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((list_len = get_xattr_names(fname)) < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -807,7 +865,10 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (XATTR_ABBREV(rxas[i])) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* See if the fnamecmp version is identical. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- len = name_len = rxas[i].name_len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((ptr = get_xattr_data(fnamecmp, name, &len, 1)) == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ flags = GXD_OMIT_COMPRESSED | GXD_NO_MISSING_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preserve_hfs_compression && sxp->st.st_flags & UF_COMPRESSED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ flags |= GXD_FILE_IS_COMPRESSED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((ptr = get_xattr_data(fnamecmp, name, &len, flags)) == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- still_abbrev:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (am_generator)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -816,14 +877,14 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ptr == UNREAD_DATA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ continue; /* XXX Is this right? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (len != rxas[i].datum_len) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto still_abbrev;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sum_init(checksum_seed);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sum_update(ptr, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sum_end(sum);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checksum_xattr_data(sum, ptr, len, sxp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (memcmp(sum, rxas[i].datum + 1, MAX_DIGEST_LEN) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto still_abbrev;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -892,6 +953,10 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_OSX_XATTRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rsync_xal_free(xalp); /* Free this because we aren't using find_matching_xattr(). */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -938,7 +1003,7 @@ char *get_xattr_acl(const char *fname, int is_access_acl, size_t *len_p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *name = is_access_acl ? XACC_ACL_ATTR : XDEF_ACL_ATTR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *len_p = 0; /* no extra data alloc needed from get_xattr_data() */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return get_xattr_data(fname, name, len_p, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return get_xattr_data(fname, name, len_p, GXD_NO_MISSING_ERROR);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int set_xattr_acl(const char *fname, int is_access_acl, const char *buf, size_t buf_len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1081,11 +1146,33 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static inline void hfs_compress_tweaks(STRUCT_STAT *fst)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (fst->st_flags & UF_COMPRESSED) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preserve_hfs_compression) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* We're sending the compression xattr, not the decompressed data fork.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Setting rsync's idea of the file size to 0 effectively prevents the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * transfer of the data fork. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fst->st_size = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* If the sender's filesystem supports compression, then we'll be able
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * to send the decompressed data fork and the decmpfs xattr will be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * hidden (not sent). As such, we need to strip the compression flag. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fst->st_flags &= ~UF_COMPRESSED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int x_stat(const char *fname, STRUCT_STAT *fst, STRUCT_STAT *xst)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ret = do_stat(fname, fst);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((ret < 0 || get_stat_xattr(fname, -1, fst, xst) < 0) && xst)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xst->st_mode = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hfs_compress_tweaks(fst);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1094,6 +1181,9 @@ int x_lstat(const char *fname, STRUCT_STAT *fst, STRUCT_STAT *xst)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ret = do_lstat(fname, fst);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((ret < 0 || get_stat_xattr(fname, -1, fst, xst) < 0) && xst)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xst->st_mode = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hfs_compress_tweaks(fst);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1102,6 +1192,9 @@ int x_fstat(int fd, STRUCT_STAT *fst, STRUCT_STAT *xst)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ret = do_fstat(fd, fst);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((ret < 0 || get_stat_xattr(NULL, fd, fst, xst) < 0) && xst)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xst->st_mode = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hfs_compress_tweaks(fst);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Nurp a/rsync.1 b/rsync.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/rsync.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/rsync.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -443,6 +443,8 @@ to the detailed description below for a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \-\-chmod=CHMOD affect file and/or directory permissions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \-A, \-\-acls preserve ACLs (implies \-p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \-X, \-\-xattrs preserve extended attributes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ \-\-hfs\-compression preserve HFS compression if supported
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ \-\-protect\-decmpfs preserve HFS compression as xattrs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \-o, \-\-owner preserve owner (super\-user only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \-g, \-\-group preserve group
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \-\-devices preserve device files (super\-user only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1307,6 +1309,44 @@ flags on files and directories that are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- receiving side. It does not try to affect user flags. This option overrides
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \fB\-\-force\-change\fP and \fB\-\-force\-uchange\fP.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .IP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.IP "\fB\-\-hfs\-compression\fP"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+This option causes rsync to preserve HFS+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+compression if the destination filesystem supports it. If the destination
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+does not support it, rsync will exit with an error.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.IP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Filesystem compression was introduced to HFS+ in Mac OS 10.6. A file that is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+compressed has no data in its data fork. Rather, the compressed data is stored
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+in an extended attribute named com.apple.decmpfs and a file flag is set to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+indicate that the file is compressed (UF_COMPRESSED). HFS+ decompresses this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+data \(dq\&on\-the\-fly\(dq\& and presents it to the operating system as a normal file.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Normal attempts to copy compressed files (e.g. in the Finder, via cp, ditto,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+etc.) will copy the file\(cq\&s decompressed contents, remove the UF_COMPRESSED file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+flag, and discard the com.apple.decmpfs extended attribute. This option will
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+preserve the data in the com.apple.decmpfs extended attribute and ignore the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+synthesized data in the file contents.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.IP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+This option implies both \fB\-\-fileflags\fP and (\-\-xattrs).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.IP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.IP "\fB\-\-protect\-decmpfs\fP"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+The com.apple.decmpfs extended attribute is hidden
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+by default from list/get xattr calls, therefore normal attempts to copy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+compressed files will functionally decompress those files. While this is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+desirable behavior when copying files to filesystems that do not support HFS+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+compression, it has serious performance and capacity impacts when backing up
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+or restoring the Mac OS X filesystem.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.IP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+This option will transfer the com.apple.decmpfs extended attribute regardless
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+of support on the destination. If a source file is compressed and an existing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+file on the destination is not compressed, the data fork of the destination
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+file will be truncated and the com.apple.decmpfs xattr will be transferred
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+instead. Note that compressed files will not be readable to the operating
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+system of the destination if that operating system does not support HFS+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+compression. Once restored (with or without this option) to an operating system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+that supports HFS+ compression, however, these files will be accessible as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+usual.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.IP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+This option implies \fB\-\-fileflags\fP and \fB\-\-xattrs\fP.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.IP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .IP "\fB\-\-chmod\fP"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This option tells rsync to apply one or more
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- comma\-separated \(dq\&chmod\(dq\& modes to the permission of the files in the
</span></pre><pre style='margin:0'>
</pre>