<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4f145ee6bd117ce0285d5743642115075daf5600">https://github.com/macports/macports-ports/commit/4f145ee6bd117ce0285d5743642115075daf5600</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4f145ee6bd117ce0285d5743642115075daf5600
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Oct 24 12:38:44 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> rsync-hfscomp: new port for rsync 3.1.2, with HFS compression
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/60792
</span>---
net/rsync-hfscomp/Portfile | 83 ++
.../files/patch-acls-unpack-error.diff | 26 +
net/rsync-hfscomp/files/patch-crtimes.diff | 735 +++++++++++
net/rsync-hfscomp/files/patch-fileflags.diff | 1301 ++++++++++++++++++++
.../files/patch-hfs-compression-options.diff | 33 +
net/rsync-hfscomp/files/patch-hfs-compression.diff | 810 ++++++++++++
net/rsync-hfscomp/files/rsyncd.conf.example | 12 +
7 files changed, 3000 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/rsync-hfscomp/Portfile b/net/rsync-hfscomp/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7883785e126
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/rsync-hfscomp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,83 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name rsync-hfscomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name rsync
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts rsync
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin freebsd sunos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mascguy @mascguy} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Fast incremental file transfer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description rsync is an open source utility that provides fast \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incremental file transfer. It works both locally and remote \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with either the custom rsyncd protocol or a remote shell \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ like ssh. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NOTE: This version includes additional macOS-specific \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ support, most notable HFS compression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://samba.org/rsync/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://rsync.samba.org/ftp/rsync/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://rsync.samba.org/ftp/rsync/src/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir ${my_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f7d6c0c9752af8d9eb933cffc6032c1763490a04 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 892724
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:popt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# these come from http://rsync.samba.org/ftp/rsync/rsync-patches-3.1.2.tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and need to be updated with each release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-fileflags.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-crtimes.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-hfs-compression.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-hfs-compression-options.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-acls-unpack-error.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-rsyncd-conf=${prefix}/etc/rsyncd.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cd ${worksrcpath}; ./prepare-source"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COPYING INSTALL NEWS OLDNEWS TODO README doc/README-SGML \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doc/profile.txt doc/rsync.sgml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${filespath}/rsyncd.conf.example \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/rsyncd.conf.example
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PREFIX__|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/rsyncd.conf.example
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.create yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.name rsyncd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.logfile ${prefix}/var/log/rsyncd.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.start "${prefix}/bin/rsync --daemon --config=${prefix}/etc/rsyncd.conf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.stop "kill `cat ${prefix}/var/run/rsyncd.pid`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.pidfile auto ${prefix}/var/run/rsyncd.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This version of rsync, while not the latest, includes additional macOS\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+support. Most notably, HFS compression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To use the rsyncd server you must copy\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+${prefix}/etc/rsyncd.conf.example to rsyncd.conf and add\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+your modules there. See 'man rsyncd.conf' for more\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+information.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/rsync-hfscomp/files/patch-acls-unpack-error.diff b/net/rsync-hfscomp/files/patch-acls-unpack-error.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..66923fa75ba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/rsync-hfscomp/files/patch-acls-unpack-error.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This patch causes rsync to report which files caused the unpack_smb_acl()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error, instead of just noting that one happened. This allows the end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use to check the ACL of the reported file by hand.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To use this patch, run these commands for a successful build:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch -p1 <patches/fileflags.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch -p1 <patches/crtimes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch -p1 <patches/hfs-compression.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch -p1 <patches/hfs-compression-options.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch -p1 <patches/acls-unpack-error.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./prepare-source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/acls.c b/acls.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/acls.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/acls.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -526,6 +526,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys_acl_free_acl(sacl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!ok) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rsyserr(FERROR_XFER, errno, "get_acl: unpack_smb_acl(%s)", fname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (no_acl_syscall_error(errno)) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/rsync-hfscomp/files/patch-crtimes.diff b/net/rsync-hfscomp/files/patch-crtimes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..58e4d560e29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/rsync-hfscomp/files/patch-crtimes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,735 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This patch adds a --crtimes (-N) option that will preserve
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+create times on OS X.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To use this patch, run these commands for a successful build:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch -p1 <patches/fileflags.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch -p1 <patches/crtimes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./prepare-source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+based-on: patch/master/fileflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/compat.c b/compat.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compat.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compat.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,6 +49,7 @@ extern int force_change;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int protect_args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_uid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_gid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int preserve_crtimes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_fileflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_acls;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_xattrs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +68,7 @@ extern char *iconv_opt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* These index values are for the file-list's extra-attribute array. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int uid_ndx, gid_ndx, crtimes_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int sender_symlink_iconv = 0; /* sender should convert symlink content */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,6 +147,8 @@ void setup_protocol(int f_out,int f_in)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uid_ndx = ++file_extra_cnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_gid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gid_ndx = ++file_extra_cnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_crtimes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crtimes_ndx = (file_extra_cnt += TIME_EXTRA_CNT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_fileflags || (force_change && !am_sender))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fileflags_ndx = ++file_extra_cnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_acls && !am_sender)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/flist.c b/flist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/flist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/flist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,6 +54,7 @@ extern int preserve_fileflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int delete_during;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int missing_args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int eol_nulls;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int crtimes_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int relative_paths;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int implied_dirs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int ignore_perishable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -398,7 +399,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ndx, int first_ndx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static time_t modtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static time_t modtime, crtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static mode_t mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static uint32 fileflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -509,6 +510,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modtime = file->modtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NSEC_BUMP(file) && protocol_version >= 31)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xflags |= XMIT_MOD_NSEC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (crtimes_ndx) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ time_t file_crtime = f_crtime(file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (file_crtime == modtime)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xflags |= XMIT_CRTIME_EQ_MTIME;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crtime = file_crtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_HARD_LINKS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tmp_dev != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -593,6 +601,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (xflags & XMIT_MOD_NSEC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write_varint(f, F_MOD_NSEC(file));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (crtimes_ndx && !(xflags & XMIT_CRTIME_EQ_MTIME))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ write_varlong(f, crtime, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(xflags & XMIT_SAME_MODE))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write_int(f, to_wire_mode(mode));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -686,7 +696,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static int64 modtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static int64 modtime, crtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static mode_t mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static uint32 fileflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -838,6 +848,19 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modtime_nsec = read_varint(f);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modtime_nsec = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (crtimes_ndx) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!(xflags & XMIT_CRTIME_EQ_MTIME)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crtime = read_varlong(f, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if SIZEOF_TIME_T < SIZEOF_INT64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!am_generator && (int64)(time_t)crtime != crtime) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(FERROR_XFER,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Create time value of %s truncated on receiver.\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lastname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crtime = modtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(xflags & XMIT_SAME_MODE))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mode = from_wire_mode(read_int(f));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1015,6 +1038,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ F_GROUP(file) = gid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file->flags |= gid_flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (crtimes_ndx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ f_crtime_set(file, (time_t)crtime);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (unsort_ndx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ F_NDX(file) = flist->used + flist->ndx_start;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1416,6 +1441,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ F_GROUP(file) = st.st_gid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (am_generator && st.st_uid == our_uid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file->flags |= FLAG_OWNED_BY_US;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (crtimes_ndx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ f_crtime_set(file, get_create_time(fname));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (basename != thisname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file->dirname = lastdir;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/generator.c b/generator.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generator.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generator.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,6 +40,7 @@ extern int preserve_xattrs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_links;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_devices;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_specials;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int preserve_fileflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_hard_links;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_executability;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_fileflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -384,8 +385,15 @@ static void do_delete_pass(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(FINFO, " \r");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static inline int time_differs(struct file_struct *file, stat_x *sxp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static inline int time_differs(struct file_struct *file, stat_x *sxp, const char *fname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (crtimes_ndx) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sxp->crtime == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sxp->crtime = get_create_time(fname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cmp_time(sxp->crtime, f_crtime(file)) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return cmp_time(sxp->st.st_mtime, file->modtime);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -443,7 +451,7 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (S_ISLNK(file->mode)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef CAN_SET_SYMLINK_TIMES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (preserve_times & PRESERVE_LINK_TIMES && time_differs(file, sxp))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_times & PRESERVE_LINK_TIMES && time_differs(file, sxp, fname))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef CAN_CHMOD_SYMLINK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -463,7 +471,7 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (preserve_times && time_differs(file, sxp))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_times && time_differs(file, sxp, fname))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (perms_differ(file, sxp))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -506,6 +514,12 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iflags |= ITEM_REPORT_TIME;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (crtimes_ndx) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sxp->crtime == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sxp->crtime = get_create_time(fnamecmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cmp_time(sxp->crtime, f_crtime(file)) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ iflags |= ITEM_REPORT_CRTIME;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (S_ISLNK(file->mode)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1130,6 +1144,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void list_file_entry(struct file_struct *f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char permbuf[PERMSTRING_SIZE];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ time_t crtime = crtimes_ndx ? f_crtime(f) : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int64 len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int colwidth = human_readable ? 14 : 11;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1145,10 +1160,12 @@ static void list_file_entry(struct file_struct *f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_LINKS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_links && S_ISLNK(f->mode)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rprintf(FINFO, "%s %*s %s %s -> %s\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(FINFO, "%s %*s %s%s%s %s -> %s\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ permbuf, colwidth, human_num(len),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- timestring(f->modtime), f_name(f, NULL),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- F_SYMLINK(f));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ timestring(f->modtime),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crtimes_ndx ? " " : "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crtimes_ndx ? timestring(crtime) : "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ f_name(f, NULL), F_SYMLINK(f));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (missing_args == 2 && f->mode == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1156,9 +1173,12 @@ static void list_file_entry(struct file_struct *f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ colwidth + 31, "*missing",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f_name(f, NULL));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rprintf(FINFO, "%s %*s %s %s\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(FINFO, "%s %*s %s%s%s %s\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ permbuf, colwidth, human_num(len),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- timestring(f->modtime), f_name(f, NULL));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ timestring(f->modtime),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crtimes_ndx ? " " : "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crtimes_ndx ? timestring(crtime) : "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ f_name(f, NULL));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1251,6 +1271,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sx.crtime = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/ifuncs.h b/ifuncs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ifuncs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ifuncs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,6 +43,28 @@ free_xbuf(xbuf *xb)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memset(xb, 0, sizeof (xbuf));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static inline time_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++f_crtime(struct file_struct *fp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if SIZEOF_TIME_T > 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ time_t crtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memcpy(&crtime, &REQ_EXTRA(fp, crtimes_ndx)->unum, SIZEOF_TIME_T);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return crtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return REQ_EXTRA(fp, crtimes_ndx)->unum;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static inline void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++f_crtime_set(struct file_struct *fp, time_t crtime)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if SIZEOF_TIME_T > 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memcpy(&REQ_EXTRA(fp, crtimes_ndx)->unum, &crtime, SIZEOF_TIME_T);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ REQ_EXTRA(fp, crtimes_ndx)->unum = (uint32)crtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to_wire_mode(mode_t mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/log.c b/log.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/log.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/log.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -712,7 +712,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c[8] = !(iflags & ITEM_REPORT_FFLAGS) ? '.' : 'f';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- c[11] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ c[11] = !(iflags & ITEM_REPORT_CRTIME) ? '.' : 'n';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ c[12] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char ch = iflags & ITEM_IS_NEW ? '+' : '?';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/options.c b/options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,6 +62,7 @@ int preserve_specials = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_uid = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_gid = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_times = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int preserve_crtimes = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int update_only = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int cvs_exclude = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int dry_run = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -716,6 +717,7 @@ void usage(enum logcode F)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," --specials preserve special files\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," -D same as --devices --specials\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," -t, --times preserve modification times\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(F," -N, --crtimes preserve create times (newness)\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," -O, --omit-dir-times omit directories from --times\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," -J, --omit-link-times omit symlinks from --times\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," --super receiver attempts super-user activities\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -883,6 +885,9 @@ static struct poptOption long_options[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"crtimes", 'N', POPT_ARG_VAL, &preserve_crtimes, 1, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"no-crtimes", 0, POPT_ARG_VAL, &preserve_crtimes, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"no-N", 0, POPT_ARG_VAL, &preserve_crtimes, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2463,6 +2468,8 @@ void server_options(char **args, int *argc_p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argstr[x++] = 'D';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_times)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argstr[x++] = 't';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_crtimes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ argstr[x++] = 'N';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_perms)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argstr[x++] = 'p';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (preserve_executability && am_sender)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/rsync.c b/rsync.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/rsync.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rsync.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -581,6 +581,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (!(preserve_times & PRESERVE_DIR_TIMES) && S_ISDIR(sxp->st.st_mode))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (!(preserve_times & PRESERVE_LINK_TIMES) && S_ISLNK(sxp->st.st_mode)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags |= ATTRS_SKIP_MTIME;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Don't set the creation date on the root folder of an HFS+ volume. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sxp->st.st_ino == 2 && S_ISDIR(sxp->st.st_mode))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags |= ATTRS_SKIP_CRTIME;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(flags & ATTRS_SKIP_MTIME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && (sxp->st.st_mtime != file->modtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef ST_MTIME_NSEC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -598,6 +601,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file->flags |= FLAG_TIME_FAILED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (crtimes_ndx && !(flags & ATTRS_SKIP_CRTIME)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ time_t file_crtime = f_crtime(file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sxp->crtime == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sxp->crtime = get_create_time(fname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cmp_time(sxp->crtime, file_crtime) != 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && set_create_time(fname, file_crtime) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ updated = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_ACLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* It's OK to call set_acl() now, even for a dir, as the generator
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -714,7 +725,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Change permissions before putting the file into place. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_file_attrs(fnametmp, file, NULL, fnamecmp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ATTRS_DELAY_IMMUTABLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | (ok_to_set_time ? 0 : ATTRS_SKIP_MTIME));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | (ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_CRTIME));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* move tmp file over real file */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (DEBUG_GTE(RECV, 1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -743,7 +754,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do_set_file_attrs:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_file_attrs(fnametmp, file, NULL, fnamecmp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_CRTIME);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (temp_copy_name) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (do_rename(fnametmp, fname) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/rsync.h b/rsync.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/rsync.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rsync.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +62,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XMIT_HLINK_FIRST (1<<12) /* protocols 30 - now (HLINKED files only) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XMIT_IO_ERROR_ENDLIST (1<<12) /* protocols 31*- now (w/XMIT_EXTENDED_FLAGS) (also protocol 30 w/'f' compat flag) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XMIT_MOD_NSEC (1<<13) /* protocols 31 - now */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define XMIT_SAME_FLAGS (1<<14) /* protocols ?? - now */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define XMIT_CRTIME_EQ_MTIME (1<<14) /* protocols ?? - now */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define XMIT_SAME_FLAGS (1<<15) /* protocols ?? - now */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* These flags are used in the live flist data. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,6 +168,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ATTRS_REPORT (1<<0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ATTRS_SKIP_MTIME (1<<1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ATTRS_DELAY_IMMUTABLE (1<<2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define ATTRS_SKIP_CRTIME (1<<3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FULL_FLUSH 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define NORMAL_FLUSH 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,7 +185,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FNAMECMP_FUZZY 0x83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* For use by the itemize_changes code */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define ITEM_REPORT_ATIME (1<<0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define ITEM_REPORT_CRTIME (1<<0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ITEM_REPORT_CHANGE (1<<1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ITEM_REPORT_SIZE (1<<2) /* regular files only */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ITEM_REPORT_TIMEFAIL (1<<2) /* symlinks only */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -734,6 +736,7 @@ extern int file_extra_cnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int inc_recurse;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int uid_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int gid_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int crtimes_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int fileflags_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int acls_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int xattrs_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -741,6 +744,7 @@ extern int xattrs_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define EXTRA_LEN (sizeof (union file_extras))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PTR_EXTRA_CNT ((sizeof (char *) + EXTRA_LEN - 1) / EXTRA_LEN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define TIME_EXTRA_CNT ((SIZEOF_TIME_T + EXTRA_LEN - 1) / EXTRA_LEN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DEV_EXTRA_CNT 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DIRNODE_EXTRA_CNT 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1021,6 +1025,7 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRUCT_STAT st;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ time_t crtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_ACLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct rsync_acl *acc_acl; /* access ACL */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct rsync_acl *def_acl; /* default ACL */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/rsync.yo b/rsync.yo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/rsync.yo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rsync.yo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -373,6 +373,7 @@ to the detailed description below for a complete description. verb(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --specials preserve special files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D same as --devices --specials
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -t, --times preserve modification times
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -N, --crtimes preserve create times (newness)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -O, --omit-dir-times omit directories from --times
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -J, --omit-link-times omit symlinks from --times
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --super receiver attempts super-user activities
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1208,6 +1209,9 @@ cause the next transfer to behave as if it used bf(-I), causing all files to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ updated (though rsync's delta-transfer algorithm will make the update fairly efficient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if the files haven't actually changed, you're much better off using bf(-t)).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dit(bf(-N, --crtimes)) This tells rsync to set the create times (newness) of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++the destination files to the same value as the source files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dit(bf(-O, --omit-dir-times)) This tells rsync to omit directories when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it is preserving modification times (see bf(--times)). If NFS is sharing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the directories on the receiving side, it is a good idea to use bf(-O).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2110,7 +2114,7 @@ with older versions of rsync, but that also turns on the output of other
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ verbose messages).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The "%i" escape has a cryptic output that is 11 letters long. The general
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-format is like the string bf(YXcstpogfax), where bf(Y) is replaced by the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++format is like the string bf(YXcstpogfaxn), where bf(Y) is replaced by the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type of update being done, bf(X) is replaced by the file-type, and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ other letters represent attributes that may be output if they are being
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modified.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2169,6 +2173,8 @@ quote(itemization(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it() The bf(f) means that the fileflags information changed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it() The bf(a) means that the ACL information changed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it() The bf(x) means that the extended attribute information changed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ it() A bf(n) means the create time (newness) is different and is being
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ updated to the sender's value (requires bf(--crtimes)).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ One other output is possible: when deleting files, the "%i" will output
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/syscall.c b/syscall.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/syscall.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/syscall.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,6 +42,13 @@ extern int force_change;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_perms;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_executability;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma pack(push, 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++struct create_time {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32 length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct timespec crtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma pack(pop)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RETURN_ERROR_IF(x,e) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (x) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -460,6 +467,36 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++time_t get_create_time(const char *path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static struct create_time attrBuf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct attrlist attrList;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memset(&attrList, 0, sizeof attrList);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ attrList.commonattr = ATTR_CMN_CRTIME;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (getattrlist(path, &attrList, &attrBuf, sizeof attrBuf, FSOPT_NOFOLLOW) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return attrBuf.crtime.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int set_create_time(const char *path, time_t crtime)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct attrlist attrList;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct timespec ts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (dry_run) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RETURN_ERROR_IF_RO_OR_LO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ts.tv_sec = crtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ts.tv_nsec = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memset(&attrList, 0, sizeof attrList);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ attrList.commonattr = ATTR_CMN_CRTIME;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return setattrlist(path, &attrList, &ts, sizeof ts, FSOPT_NOFOLLOW);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_UTIMENSAT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/testsuite/crtimes.test b/testsuite/crtimes.test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+new file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/testsuite/crtimes.test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#! /bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Test rsync copying create times
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++. "$suitedir/rsync.fns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Setting an older time via touch sets the create time to the mtime.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Setting it to a newer time affects just the mtime.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++mkdir "$fromdir"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++echo hiho "$fromdir/foo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++touch -t 200101011111.11 "$fromdir"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++touch -t 200202022222.22 "$fromdir"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++touch -t 200111111111.11 "$fromdir/foo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++touch -t 200212122222.22 "$fromdir/foo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TLS_ARGS=--crtimes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++checkit "$RSYNC -rtgvvv --crtimes \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# The script would have aborted on error, so getting here means we've won.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++exit 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/testsuite/rsync.fns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/testsuite/rsync.fns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,9 +23,9 @@ todir="$tmpdir/to"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chkdir="$tmpdir/chk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For itemized output:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-all_plus='+++++++++'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-allspace=' '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dots='.....' # trailing dots after changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++all_plus='++++++++++'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++allspace=' '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dots='......' # trailing dots after changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tab_ch=' ' # a single tab character
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Berkley's nice.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tls.c b/tls.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tls.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tls.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,6 +109,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int display_crtimes = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void failed(char const *what, char const *where)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, PROGRAM ": %s %s: %s\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,16 +118,44 @@ static void failed(char const *what, char const *where)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void storetime(char *dest, size_t destsize, time_t t, int nsecs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (t) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct tm *mt = gmtime(&t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ len = snprintf(dest, destsize,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "%04d-%02d-%02d %02d:%02d:%02d",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (int)mt->tm_year + 1900,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (int)mt->tm_mon + 1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (int)mt->tm_mday,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (int)mt->tm_hour,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (int)mt->tm_min,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (int)mt->tm_sec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (nsecs >= 0 && len >= 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ snprintf(dest + len, destsize - len, ".%09d", nsecs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int has_nsecs = nsecs >= 0 ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int len = MIN(19 + 9*has_nsecs, (int)destsize - 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memset(dest, ' ', len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dest[len] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void list_file(const char *fname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRUCT_STAT buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ time_t crtime = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char permbuf[PERMSTRING_SIZE];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct tm *mt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char datebuf[50];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char mtimebuf[50];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char crtimebuf[50];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char linkbuf[4096];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int nsecs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (do_lstat(fname, &buf) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ failed("stat", fname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (display_crtimes && (crtime = get_create_time(fname)) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ failed("get_create_time", fname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_XATTRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (am_root < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stat_xattr(fname, &buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -159,30 +189,17 @@ static void list_file(const char *fname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ permstring(permbuf, buf.st_mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (buf.st_mtime) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mt = gmtime(&buf.st_mtime);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- len = snprintf(datebuf, sizeof datebuf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "%04d-%02d-%02d %02d:%02d:%02d",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (int)mt->tm_year + 1900,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (int)mt->tm_mon + 1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (int)mt->tm_mday,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (int)mt->tm_hour,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (int)mt->tm_min,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (int)mt->tm_sec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef ST_MTIME_NSEC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (nsec_times) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- snprintf(datebuf + len, sizeof datebuf - len,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ".%09d", (int)buf.ST_MTIME_NSEC);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (nsec_times)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ nsecs = (int)buf.ST_MTIME_NSEC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- memset(datebuf, ' ', len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- datebuf[len] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ nsecs = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ storetime(mtimebuf, sizeof mtimebuf, buf.st_mtime, nsecs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (display_crtimes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ storetime(crtimebuf, sizeof crtimebuf, crtime, -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ crtimebuf[0] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* TODO: Perhaps escape special characters in fname? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -193,13 +210,14 @@ static void list_file(const char *fname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (long)minor(buf.st_rdev));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("%15s", do_big_num(buf.st_size, 1, NULL));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- printf(" %6ld.%-6ld %6ld %s %s%s\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- datebuf, fname, linkbuf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mtimebuf, crtimebuf, fname, linkbuf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct poptOption long_options[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"crtimes", 'N', POPT_ARG_NONE, &display_crtimes, 0, 0, 0},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"link-times", 'l', POPT_ARG_NONE, &link_times, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"link-owner", 'L', POPT_ARG_NONE, &link_owner, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_XATTRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -218,6 +236,7 @@ static void tls_usage(int ret)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(F,"Trivial file listing program for portably checking rsync\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(F,"\nOptions:\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(F," -N, --crtimes display create times (newness)\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(F," -l, --link-times display the time on a symlink\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(F," -L, --link-owner display the owner+group on a symlink\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_XATTRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nurp a/proto.h b/proto.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/proto.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/proto.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -328,6 +328,8 @@ int do_stat(const char *fname, STRUCT_ST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_lstat(const char *fname, STRUCT_STAT *st);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_fstat(int fd, STRUCT_STAT *st);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OFF_T do_lseek(int fd, OFF_T offset, int whence);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++time_t get_create_time(const char *path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int set_create_time(const char *path, time_t crtime);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nurp a/rsync.1 b/rsync.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/rsync.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rsync.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -449,6 +449,7 @@ to the detailed description below for a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-\-specials preserve special files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-D same as \-\-devices \-\-specials
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-t, \-\-times preserve modification times
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ \-N, \-\-crtimes preserve create times (newness)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-O, \-\-omit\-dir\-times omit directories from \-\-times
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-J, \-\-omit\-link\-times omit symlinks from \-\-times
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-\-super receiver attempts super\-user activities
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1386,6 +1387,10 @@ cause the next transfer to behave as if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ updated (though rsync\(cq\&s delta\-transfer algorithm will make the update fairly efficient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if the files haven\(cq\&t actually changed, you\(cq\&re much better off using \fB\-t\fP).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP "\fB\-N, \-\-crtimes\fP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This tells rsync to set the create times (newness) of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++the destination files to the same value as the source files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP "\fB\-O, \-\-omit\-dir\-times\fP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This tells rsync to omit directories when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it is preserving modification times (see \fB\-\-times\fP). If NFS is sharing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2397,7 +2402,7 @@ with older versions of rsync, but that a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ verbose messages).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The \(dq\&%i\(dq\& escape has a cryptic output that is 11 letters long. The general
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-format is like the string \fBYXcstpogfax\fP, where \fBY\fP is replaced by the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++format is like the string \fBYXcstpogfaxn\fP, where \fBY\fP is replaced by the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type of update being done, \fBX\fP is replaced by the file\-type, and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ other letters represent attributes that may be output if they are being
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modified.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2472,6 +2477,9 @@ The \fBf\fP means that the fileflags inf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The \fBa\fP means that the ACL information changed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The \fBx\fP means that the extended attribute information changed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++A \fBn\fP means the create time (newness) is different and is being
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++updated to the sender\(cq\&s value (requires \fB\-\-crtimes\fP).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .RE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/rsync-hfscomp/files/patch-fileflags.diff b/net/rsync-hfscomp/files/patch-fileflags.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8fa3720dd54
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/rsync-hfscomp/files/patch-fileflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,1301 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This patch provides --fileflags, which preserves the st_flags stat() field.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Modified from a patch that was written by Rolf Grossmann.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To use this patch, run these commands for a successful build:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch -p1 <patches/fileflags.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./prepare-source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+based-on: 16b49716d55a50f2e985b879b720b2c53c892a3a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/Makefile.in b/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,7 +46,7 @@ popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ popt/popthelp.o popt/poptparse.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TLS_OBJ = tls.o syscall.o t_stub.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Programs we must have to run the test cases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -128,7 +128,7 @@ getgroups$(EXEEXT): getgroups.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ getfsdev$(EXEEXT): getfsdev.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TRIMSLASH_OBJ = trimslash.o syscall.o lib/compat.o lib/snprintf.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TRIMSLASH_OBJ = trimslash.o syscall.o t_stub.o lib/compat.o lib/snprintf.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ trimslash$(EXEEXT): $(TRIMSLASH_OBJ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/compat.c b/compat.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compat.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compat.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,9 +45,11 @@ extern int checksum_seed;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int basis_dir_cnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int prune_empty_dirs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int protocol_version;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int force_change;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int protect_args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_uid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_gid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int preserve_fileflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_acls;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_xattrs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int need_messages_from_generator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,7 +67,7 @@ extern char *iconv_opt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* These index values are for the file-list's extra-attribute array. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int sender_symlink_iconv = 0; /* sender should convert symlink content */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,6 +146,8 @@ void setup_protocol(int f_out,int f_in)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uid_ndx = ++file_extra_cnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_gid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gid_ndx = ++file_extra_cnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_fileflags || (force_change && !am_sender))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fileflags_ndx = ++file_extra_cnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_acls && !am_sender)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ acls_ndx = ++file_extra_cnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_xattrs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -593,6 +593,7 @@ AC_FUNC_UTIME_NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_FUNC_ALLOCA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fchmod fstat ftruncate strchr readlink link utime utimes lutimes strftime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ chflags \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memmove lchown vsnprintf snprintf vasprintf asprintf setsid strpbrk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/delete.c b/delete.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/delete.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/delete.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int am_root;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int make_backups;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int max_delete;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int force_change;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char *backup_dir;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char *backup_suffix;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int backup_suffix_len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,8 +98,12 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strlcpy(p, fp->basename, remainder);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ make_mutable(fname, fp->mode, F_FFLAGS(fp), force_change);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(fp->mode & S_IWUSR) && !am_root && fp->flags & FLAG_OWNED_BY_US)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- do_chmod(fname, fp->mode | S_IWUSR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ do_chmod(fname, fp->mode | S_IWUSR, NO_FFLAGS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Save stack by recursing to ourself directly. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (S_ISDIR(fp->mode)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,11 +144,18 @@ enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (flags & DEL_NO_UID_WRITE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- do_chmod(fbuf, mode | S_IWUSR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ do_chmod(fbuf, mode | S_IWUSR, NO_FFLAGS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* This only happens on the first call to delete_item() since
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STRUCT_STAT st;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (x_lstat(fbuf, &st, NULL) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ make_mutable(fbuf, st.st_mode, st.st_flags, force_change);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ignore_perishable = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* If DEL_RECURSE is not set, this just reports emptiness. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = delete_dir_contents(fbuf, flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/flist.c b/flist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/flist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/flist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,6 +50,7 @@ extern int preserve_links;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_hard_links;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_devices;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_specials;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int preserve_fileflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int delete_during;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int missing_args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int eol_nulls;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -399,6 +400,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static time_t modtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static mode_t mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static uint32 fileflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_HARD_LINKS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int64 dev;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,6 +446,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xflags |= XMIT_SAME_MODE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mode = file->mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_fileflags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (F_FFLAGS(file) == fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xflags |= XMIT_SAME_FLAGS;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fileflags = F_FFLAGS(file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_devices && IS_DEVICE(mode)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (protocol_version < 28) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -583,6 +595,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write_varint(f, F_MOD_NSEC(file));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(xflags & XMIT_SAME_MODE))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write_int(f, to_wire_mode(mode));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_fileflags && !(xflags & XMIT_SAME_FLAGS))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ write_int(f, (int)fileflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (protocol_version < 30)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write_int(f, uid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -672,6 +688,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int64 modtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static mode_t mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static uint32 fileflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_HARD_LINKS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int64 dev;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -779,6 +798,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modtime = first->modtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modtime_nsec = F_MOD_NSEC(first);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mode = first->mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fileflags = F_FFLAGS(first);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_uid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uid = F_OWNER(first);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_gid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -820,6 +843,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (chmod_modes && !S_ISLNK(mode) && mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mode = tweak_mode(mode, chmod_modes);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_fileflags && !(xflags & XMIT_SAME_FLAGS))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fileflags = (uint32)read_int(f);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (protocol_version < 30)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -978,6 +1005,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file->mode = mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ F_FFLAGS(file) = fileflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_uid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ F_OWNER(file) = uid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_gid) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1375,6 +1406,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file->mode = st.st_mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (fileflags_ndx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ F_FFLAGS(file) = st.st_flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_uid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ F_OWNER(file) = st.st_uid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_gid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/generator.c b/generator.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generator.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generator.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,8 +42,10 @@ extern int preserve_devices;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_specials;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_hard_links;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_executability;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int preserve_fileflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_perms;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_times;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int force_change;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int delete_mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int delete_before;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int delete_during;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -465,6 +467,10 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (perms_differ(file, sxp))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_fileflags && sxp->st.st_flags != F_FFLAGS(file))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ownership_differs(file, sxp))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_ACLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -516,6 +522,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && sxp->st.st_gid != (gid_t)F_GROUP(file))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iflags |= ITEM_REPORT_GROUP;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_fileflags && !S_ISLNK(file->mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && sxp->st.st_flags != F_FFLAGS(file))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ iflags |= ITEM_REPORT_FFLAGS;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_ACLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_acls && !S_ISLNK(file->mode)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!ACL_READY(*sxp))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1408,6 +1419,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file->mode = dest_mode(file->mode, sx.st.st_mode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dflt_perms, statret == 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change && !preserve_fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ F_FFLAGS(file) = sx.st.st_flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (statret != 0 && basis_dir[0] != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ itemizing, code);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1452,10 +1467,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * readable and writable permissions during the time we are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * putting files within them. This is then restored to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * former permissions after the transfer is done. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change && F_FFLAGS(file) & force_change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && make_mutable(fname, file->mode, F_FFLAGS(file), force_change))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ need_retouch_dir_perms = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_CHMOD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!am_root && (file->mode & S_IRWXU) != S_IRWXU && dir_tweaking) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mode_t mode = file->mode | S_IRWXU;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (do_chmod(fname, mode) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (do_chmod(fname, mode, 0) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rsyserr(FERROR_XFER, errno,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "failed to modify permissions on %s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ full_fname(fname));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1491,6 +1511,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exists);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change && !preserve_fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ F_FFLAGS(file) = sx.st.st_flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_HARD_LINKS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2059,13 +2083,17 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fname = f_name(file, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fix_dir_perms)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- do_chmod(fname, file->mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ do_chmod(fname, file->mode, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (need_retouch_dir_times) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRUCT_STAT st;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (link_stat(fname, &st, 0) == 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && cmp_time(st.st_mtime, file->modtime) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_modtime(fname, file->modtime, F_MOD_NSEC(file), file->mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_modtime(fname, file->modtime, F_MOD_NSEC(file), file->mode, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change && F_FFLAGS(file) & force_change)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ undo_make_mutable(fname, F_FFLAGS(file));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (counter >= loopchk_limit) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (allowed_lull)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/log.c b/log.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/log.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/log.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -709,7 +709,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ c[8] = !(iflags & ITEM_REPORT_FFLAGS) ? '.' : 'f';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c[11] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/main.c b/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <locale.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/sysctl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int dry_run;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int list_only;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,6 +54,7 @@ extern int copy_unsafe_links;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int keep_dirlinks;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_hard_links;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int protocol_version;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int force_change;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int file_total;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int recurse;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int xfer_dirs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -840,6 +844,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * points to an identical file won't be replaced by the referent. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy_links = copy_dirlinks = copy_unsafe_links = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change & SYS_IMMUTABLE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Determine whether we'll be able to unlock a system immutable item. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int mib[2];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int securityLevel = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t len = sizeof securityLevel;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mib[0] = CTL_KERN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mib[1] = KERN_SECURELVL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sysctl(mib, 2, &securityLevel, &len, NULL, 0) == 0 && securityLevel > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(FERROR, "System security level is too high to force mutability on system immutable files and directories.\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit_cleanup(RERR_UNSUPPORTED);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_HARD_LINKS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_hard_links && !inc_recurse)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ match_hard_links(first_flist);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/options.c b/options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,6 +55,7 @@ int preserve_hard_links = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_acls = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_xattrs = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_perms = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int preserve_fileflags = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_executability = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_devices = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_specials = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,6 +90,7 @@ int numeric_ids = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int msgs2stderr = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int allow_8bit_chars = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int force_delete = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int force_change = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int io_timeout = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int prune_empty_dirs = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int use_qsort = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -572,6 +574,7 @@ static void print_rsync_version(enum logcode f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char const *links = "no ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char const *iconv = "no ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char const *ipv6 = "no ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char const *fileflags = "no ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRUCT_STAT *dumstat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if SUBPROTOCOL_VERSION != 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -608,6 +611,9 @@ static void print_rsync_version(enum logcode f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef CAN_SET_SYMLINK_TIMES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ symtimes = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fileflags = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(f, "%s version %s protocol version %d%s\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -621,8 +627,8 @@ static void print_rsync_version(enum logcode f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (int)(sizeof (int64) * 8));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ got_socketpair, hardlinks, links, ipv6, have_inplace);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sprealloc\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- have_inplace, acls, xattrs, iconv, symtimes, prealloc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sprealloc, %sfile-flags\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ have_inplace, acls, xattrs, iconv, symtimes, prealloc, fileflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef MAINTAINER_MODE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -693,6 +699,9 @@ void usage(enum logcode F)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," -H, --hard-links preserve hard links\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," -p, --perms preserve permissions\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(F," --fileflags preserve file-flags (aka chflags)\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," -E, --executability preserve the file's executability\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_ACLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -738,7 +747,12 @@ void usage(enum logcode F)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," --ignore-missing-args ignore missing source args without error\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," --delete-missing-args delete missing source args from destination\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," --ignore-errors delete even if there are I/O errors\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rprintf(F," --force force deletion of directories even if not empty\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(F," --force-delete force deletion of directories even if not empty\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(F," --force-change affect user-/system-immutable files/dirs\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(F," --force-uchange affect user-immutable files/dirs\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(F," --force-schange affect system-immutable files/dirs\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," --max-delete=NUM don't delete more than NUM files\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," --max-size=SIZE don't transfer any file larger than SIZE\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," --min-size=SIZE don't transfer any file smaller than SIZE\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -855,6 +869,10 @@ static struct poptOption long_options[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 1, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"no-fileflags", 0, POPT_ARG_VAL, &preserve_fileflags, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -941,6 +959,14 @@ static struct poptOption long_options[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"remove-source-files",0,POPT_ARG_VAL, &remove_source_files, 1, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"force", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"no-force", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"force-delete", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"no-force-delete", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"force-change", 0, POPT_ARG_VAL, &force_change, ALL_IMMUTABLE, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"no-force-change", 0, POPT_ARG_VAL, &force_change, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"force-uchange", 0, POPT_ARG_VAL, &force_change, USR_IMMUTABLE, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"force-schange", 0, POPT_ARG_VAL, &force_change, SYS_IMMUTABLE, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 1, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"no-ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2539,6 +2565,9 @@ void server_options(char **args, int *argc_p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (xfer_dirs && !recurse && delete_mode && am_sender)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args[ac++] = "--no-r";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args[ac++] = "--fileflags";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto oom;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2626,6 +2655,16 @@ void server_options(char **args, int *argc_p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args[ac++] = "--delete-excluded";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (force_delete)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args[ac++] = "--force";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change == ALL_IMMUTABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args[ac++] = "--force-change";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (force_change == USR_IMMUTABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args[ac++] = "--force-uchange";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (force_change == SYS_IMMUTABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args[ac++] = "--force-schange";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (write_batch < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args[ac++] = "--only-write-batch=X";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (am_root > 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/rsync.c b/rsync.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/rsync.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rsync.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +31,7 @@ extern int dry_run;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_acls;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_xattrs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_perms;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int preserve_fileflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_executability;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_times;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int am_root;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -452,6 +453,39 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return new_mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Set a file's st_flags. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int set_fileflags(const char *fname, uint32 fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (do_chflags(fname, fileflags) != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rsyserr(FERROR_XFER, errno,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "failed to set file flags on %s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ full_fname(fname));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Remove immutable flags from an object, so it can be altered/removed. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int make_mutable(const char *fname, mode_t mode, uint32 fileflags, uint32 iflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (S_ISLNK(mode) || !(fileflags & iflags))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!set_fileflags(fname, fileflags & ~iflags))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Undo a prior make_mutable() call that returned a 1. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int undo_make_mutable(const char *fname, uint32 fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!set_fileflags(fname, fileflags))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *fnamecmp, int flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -513,7 +547,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (am_root >= 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uid_t uid = change_uid ? (uid_t)F_OWNER(file) : sxp->st.st_uid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gid_t gid = change_gid ? (gid_t)F_GROUP(file) : sxp->st.st_gid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (do_lchown(fname, uid, gid) != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (do_lchown(fname, uid, gid, sxp->st.st_mode, ST_FLAGS(sxp->st)) != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* We shouldn't have attempted to change uid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * or gid unless have the privilege. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rsyserr(FERROR_XFER, errno, "%s %s failed",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -553,7 +587,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (NSEC_BUMP(file) && (uint32)sxp->st.ST_MTIME_NSEC != F_MOD_NSEC(file))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode, ST_FLAGS(sxp->st));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ret < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rsyserr(FERROR_XFER, errno, "failed to set times on %s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ full_fname(fname));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -580,7 +614,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_CHMOD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int ret = am_root < 0 ? 0 : do_chmod(fname, new_mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int ret = am_root < 0 ? 0 : do_chmod(fname, new_mode, ST_FLAGS(sxp->st));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ret < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rsyserr(FERROR_XFER, errno,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "failed to set permissions on %s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -592,6 +626,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_fileflags && !S_ISLNK(sxp->st.st_mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && sxp->st.st_flags != F_FFLAGS(file)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32 fileflags = F_FFLAGS(file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (flags & ATTRS_DELAY_IMMUTABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fileflags &= ~ALL_IMMUTABLE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sxp->st.st_flags != fileflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && !set_fileflags(fname, fileflags))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ goto cleanup;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ updated = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (INFO_GTE(NAME, 2) && flags & ATTRS_REPORT) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (updated)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(FCLIENT, "%s\n", fname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -666,7 +713,8 @@ int finish_transfer(const char *fname, const char *fnametmp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Change permissions before putting the file into place. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_file_attrs(fnametmp, file, NULL, fnamecmp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ATTRS_DELAY_IMMUTABLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | (ok_to_set_time ? 0 : ATTRS_SKIP_MTIME));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* move tmp file over real file */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (DEBUG_GTE(RECV, 1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -683,6 +731,10 @@ int finish_transfer(const char *fname, const char *fnametmp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ret == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* The file was moved into place (not copied), so it's done. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_fileflags && F_FFLAGS(file) & ALL_IMMUTABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_fileflags(fname, F_FFLAGS(file));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* The file was copied, so tweak the perms of the copied file. If it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/rsync.h b/rsync.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/rsync.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rsync.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,6 +62,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XMIT_HLINK_FIRST (1<<12) /* protocols 30 - now (HLINKED files only) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XMIT_IO_ERROR_ENDLIST (1<<12) /* protocols 31*- now (w/XMIT_EXTENDED_FLAGS) (also protocol 30 w/'f' compat flag) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XMIT_MOD_NSEC (1<<13) /* protocols 31 - now */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define XMIT_SAME_FLAGS (1<<14) /* protocols ?? - now */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* These flags are used in the live flist data. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -165,6 +166,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ATTRS_REPORT (1<<0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ATTRS_SKIP_MTIME (1<<1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define ATTRS_DELAY_IMMUTABLE (1<<2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FULL_FLUSH 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define NORMAL_FLUSH 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -191,6 +193,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ITEM_REPORT_GROUP (1<<6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ITEM_REPORT_ACL (1<<7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ITEM_REPORT_XATTR (1<<8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define ITEM_REPORT_FFLAGS (1<<9)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ITEM_BASIS_TYPE_FOLLOWS (1<<11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ITEM_XNAME_FOLLOWS (1<<12)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ITEM_IS_NEW (1<<13)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -522,6 +525,28 @@ typedef unsigned int size_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define NO_FFLAGS ((uint32)-1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_CHFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SUPPORT_FILEFLAGS 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SUPPORT_FORCE_CHANGE 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef UF_NOUNLINK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define UF_NOUNLINK 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef SF_NOUNLINK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SF_NOUNLINK 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define USR_IMMUTABLE (UF_IMMUTABLE|UF_NOUNLINK|UF_APPEND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SYS_IMMUTABLE (SF_IMMUTABLE|SF_NOUNLINK|SF_APPEND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define ALL_IMMUTABLE (USR_IMMUTABLE|SYS_IMMUTABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define ST_FLAGS(st) (st.st_flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define ST_FLAGS(st) NO_FFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Find a variable that is either exactly 32-bits or longer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * If some code depends on 32-bit truncation, it will need to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * take special action in a "#if SIZEOF_INT32 > 4" section. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -709,6 +734,7 @@ extern int file_extra_cnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int inc_recurse;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int uid_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int gid_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int fileflags_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int acls_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int xattrs_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -750,6 +776,11 @@ extern int xattrs_ndx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* When the associated option is on, all entries will have these present: */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define F_FFLAGS(f) REQ_EXTRA(f, fileflags_ndx)->unum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define F_FFLAGS(f) NO_FFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define F_ACL(f) REQ_EXTRA(f, acls_ndx)->num
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define F_XATTR(f) REQ_EXTRA(f, xattrs_ndx)->num
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define F_NDX(f) REQ_EXTRA(f, unsort_ndx)->num
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/rsync.yo b/rsync.yo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/rsync.yo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rsync.yo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -362,6 +362,7 @@ to the detailed description below for a complete description. verb(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -K, --keep-dirlinks treat symlinked dir on receiver as dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -H, --hard-links preserve hard links
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -p, --perms preserve permissions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ --fileflags preserve file-flags (aka chflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -E, --executability preserve executability
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --chmod=CHMOD affect file and/or directory permissions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -A, --acls preserve ACLs (implies -p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -397,7 +398,10 @@ to the detailed description below for a complete description. verb(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --ignore-missing-args ignore missing source args without error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --delete-missing-args delete missing source args from destination
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --ignore-errors delete even if there are I/O errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- --force force deletion of dirs even if not empty
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ --force-delete force deletion of dirs even if not empty
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ --force-change affect user/system immutable files/dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ --force-uchange affect user-immutable files/dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ --force-schange affect system-immutable files/dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --max-delete=NUM don't delete more than NUM files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --max-size=SIZE don't transfer any file larger than SIZE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --min-size=SIZE don't transfer any file smaller than SIZE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -646,7 +650,8 @@ specified, in which case bf(-r) is not implied.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Note that bf(-a) bf(does not preserve hardlinks), because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ finding multiply-linked files is expensive. You must separately
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-specify bf(-H).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++specify bf(-H). Note also that for backward compatibility, bf(-a)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++currently does bf(not) imply the bf(--fileflags) option.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dit(--no-OPTION) You may turn off one or more implied options by prefixing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the option name with "no-". Not all options may be prefixed with a "no-":
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -950,7 +955,7 @@ they would be using bf(--copy-links).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Without this option, if the sending side has replaced a directory with a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ symlink to a directory, the receiving side will delete anything that is in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the way of the new symlink, including a directory hierarchy (as long as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-bf(--force) or bf(--delete) is in effect).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bf(--force-delete) or bf(--delete) is in effect).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ See also bf(--keep-dirlinks) for an analogous option for the receiving
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ side.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1113,6 +1118,29 @@ Note that this option does not copy rsyncs special xattr values (e.g. those
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ used by bf(--fake-super)) unless you repeat the option (e.g. -XX). This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "copy all xattrs" mode cannot be used with bf(--fake-super).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dit(bf(--fileflags)) This option causes rsync to update the file-flags to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++the same as the source files and directories (if your OS supports the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bf(chflags)(2) system call). Some flags can only be altered by the super-user
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++and some might only be unset below a certain secure-level (usually single-user
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++mode). It will not make files alterable that are set to immutable on the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++receiver. To do that, see bf(--force-change), bf(--force-uchange), and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bf(--force-schange).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dit(bf(--force-change)) This option causes rsync to disable both user-immutable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++and system-immutable flags on files and directories that are being updated or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++deleted on the receiving side. This option overrides bf(--force-uchange) and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bf(--force-schange).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dit(bf(--force-uchange)) This option causes rsync to disable user-immutable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++flags on files and directories that are being updated or deleted on the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++receiving side. It does not try to affect system flags. This option overrides
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bf(--force-change) and bf(--force-schange).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dit(bf(--force-schange)) This option causes rsync to disable system-immutable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++flags on files and directories that are being updated or deleted on the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++receiving side. It does not try to affect user flags. This option overrides
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bf(--force-change) and bf(--force-uchange).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dit(bf(--chmod)) This option tells rsync to apply one or more
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ comma-separated "chmod" modes to the permission of the files in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transfer. The resulting value is treated as though it were the permissions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1442,12 +1470,13 @@ display as a "*missing" entry in the bf(--list-only) output.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dit(bf(--ignore-errors)) Tells bf(--delete) to go ahead and delete files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ even when there are I/O errors.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dit(bf(--force)) This option tells rsync to delete a non-empty directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dit(bf(--force-delete)) This option tells rsync to delete a non-empty directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ when it is to be replaced by a non-directory. This is only relevant if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deletions are not active (see bf(--delete) for details).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Note for older rsync versions: bf(--force) used to still be required when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-using bf(--delete-after), and it used to be non-functional unless the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option can be abbreviated bf(--force) for backward compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Note that some older rsync versions used to still require bf(--force)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++when using bf(--delete-after), and it used to be non-functional unless the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bf(--recursive) option was also enabled.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dit(bf(--max-delete=NUM)) This tells rsync not to delete more than NUM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2081,7 +2110,7 @@ with older versions of rsync, but that also turns on the output of other
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ verbose messages).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The "%i" escape has a cryptic output that is 11 letters long. The general
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-format is like the string bf(YXcstpoguax), where bf(Y) is replaced by the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++format is like the string bf(YXcstpogfax), where bf(Y) is replaced by the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type of update being done, bf(X) is replaced by the file-type, and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ other letters represent attributes that may be output if they are being
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modified.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2137,7 +2166,7 @@ quote(itemization(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sender's value (requires bf(--owner) and super-user privileges).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it() A bf(g) means the group is different and is being updated to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sender's value (requires bf(--group) and the authority to set the group).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- it() The bf(u) slot is reserved for future use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ it() The bf(f) means that the fileflags information changed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it() The bf(a) means that the ACL information changed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it() The bf(x) means that the extended attribute information changed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/syscall.c b/syscall.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/syscall.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/syscall.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,6 +38,7 @@ extern int am_root;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int am_sender;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int read_only;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int list_only;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int force_change;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_perms;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_executability;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +56,23 @@ int do_unlink(const char *fname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dry_run) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RETURN_ERROR_IF_RO_OR_LO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return unlink(fname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (unlink(fname) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change && errno == EPERM) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STRUCT_STAT st;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (x_lstat(fname, &st, NULL) == 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && make_mutable(fname, st.st_mode, st.st_flags, force_change) > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (unlink(fname) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ undo_make_mutable(fname, st.st_flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* TODO: handle immutable directories */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errno = EPERM;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_LINKS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,14 +133,37 @@ int do_link(const char *fname1, const char *fname2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int do_lchown(const char *path, uid_t owner, gid_t group)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int do_lchown(const char *path, uid_t owner, gid_t group, mode_t mode, uint32 fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dry_run) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RETURN_ERROR_IF_RO_OR_LO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef HAVE_LCHOWN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define lchown chown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return lchown(path, owner, group);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (lchown(path, owner, group) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change && errno == EPERM) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (fileflags == NO_FFLAGS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STRUCT_STAT st;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (x_lstat(path, &st, NULL) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mode = st.st_mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fileflags = st.st_flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (fileflags != NO_FFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && make_mutable(path, mode, fileflags, force_change) > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int ret = lchown(path, owner, group);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ undo_make_mutable(path, fileflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ret == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errno = EPERM;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mode = fileflags = 0; /* avoid compiler warning */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_mknod(const char *pathname, mode_t mode, dev_t dev)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,7 +203,7 @@ int do_mknod(const char *pathname, mode_t mode, dev_t dev)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(sock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_CHMOD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return do_chmod(pathname, mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return do_chmod(pathname, mode, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,7 +220,22 @@ int do_rmdir(const char *pathname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dry_run) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RETURN_ERROR_IF_RO_OR_LO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return rmdir(pathname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (rmdir(pathname) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change && errno == EPERM) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STRUCT_STAT st;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (x_lstat(pathname, &st, NULL) == 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && make_mutable(pathname, st.st_mode, st.st_flags, force_change) > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (rmdir(pathname) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ undo_make_mutable(pathname, st.st_flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errno = EPERM;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_open(const char *pathname, int flags, mode_t mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -194,7 +249,7 @@ int do_open(const char *pathname, int flags, mode_t mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_CHMOD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int do_chmod(const char *path, mode_t mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int do_chmod(const char *path, mode_t mode, uint32 fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int code;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dry_run) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -217,17 +272,74 @@ int do_chmod(const char *path, mode_t mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* !HAVE_LCHMOD */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (code < 0 && force_change && errno == EPERM && !S_ISLNK(mode)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (fileflags == NO_FFLAGS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STRUCT_STAT st;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (x_lstat(path, &st, NULL) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fileflags = st.st_flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (fileflags != NO_FFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && make_mutable(path, mode, fileflags, force_change) > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ code = chmod(path, mode & CHMOD_BITS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ undo_make_mutable(path, fileflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (code == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errno = EPERM;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fileflags = 0; /* avoid compiler warning */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (code != 0 && (preserve_perms || preserve_executability))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return code;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_CHFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int do_chflags(const char *path, uint32 fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (dry_run) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RETURN_ERROR_IF_RO_OR_LO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return chflags(path, fileflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_rename(const char *fname1, const char *fname2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dry_run) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RETURN_ERROR_IF_RO_OR_LO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return rename(fname1, fname2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (rename(fname1, fname2) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change && errno == EPERM) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STRUCT_STAT st1, st2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int became_mutable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (x_lstat(fname1, &st1, NULL) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ goto failed;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ became_mutable = make_mutable(fname1, st1.st_mode, st1.st_flags, force_change) > 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (became_mutable && rename(fname1, fname2) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ goto success;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (x_lstat(fname2, &st2, NULL) == 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && make_mutable(fname2, st2.st_mode, st2.st_flags, force_change) > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (rename(fname1, fname2) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ success:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (became_mutable) /* Yes, use fname2 and st1! */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ undo_make_mutable(fname2, st1.st_flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ undo_make_mutable(fname2, st2.st_flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* TODO: handle immutable directories */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (became_mutable)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ undo_make_mutable(fname1, st1.st_flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ failed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errno = EPERM;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_FTRUNCATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/t_stub.c b/t_stub.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/t_stub.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/t_stub.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,6 +28,7 @@ int module_id = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int checksum_len = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int relative_paths = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int module_dirlen = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int force_change = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_acls = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_times = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_xattrs = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,3 +98,23 @@ filter_rule_list daemon_filter_list;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "tester";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int make_mutable(UNUSED(const char *fname), UNUSED(mode_t mode), UNUSED(uint32 fileflags), UNUSED(uint32 iflags))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Undo a prior make_mutable() call that returned a 1. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int undo_make_mutable(UNUSED(const char *fname), UNUSED(uint32 fileflags))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_XATTRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int x_lstat(UNUSED(const char *fname), UNUSED(STRUCT_STAT *fst), UNUSED(STRUCT_STAT *xst))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/util.c b/util.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/util.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/util.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,7 @@ extern int relative_paths;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_times;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_xattrs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preallocate_files;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int force_change;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char *module_dir;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern unsigned int module_dirlen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char *partial_dir;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -115,9 +116,36 @@ void print_child_argv(const char *prefix, char **cmd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(FCLIENT, " (%d args)\n", cnt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int try_a_force_change(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (fileflags == NO_FFLAGS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STRUCT_STAT st;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (x_lstat(fname, &st, NULL) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fileflags = st.st_flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (fileflags != NO_FFLAGS && make_mutable(fname, mode, fileflags, force_change) > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int ret, save_force_change = force_change;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ force_change = 0; /* Make certain we can't come back here. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = set_modtime(fname, modtime, mod_nsec, mode, fileflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ force_change = save_force_change;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ undo_make_mutable(fname, fileflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errno = EPERM;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* This returns 0 for success, 1 for a symlink if symlink time-setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * is not possible, or -1 for any other error. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int switch_step = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,6 +160,11 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "case_N.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (do_utimensat(fname, modtime, mod_nsec) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change && errno == EPERM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && try_a_force_change(fname, modtime, mod_nsec, mode, fileflags) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (errno != ENOSYS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch_step++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,6 +175,11 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "case_N.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (do_lutimes(fname, modtime, mod_nsec) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change && errno == EPERM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && try_a_force_change(fname, modtime, mod_nsec, mode, fileflags) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (errno != ENOSYS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch_step++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -165,6 +203,13 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (do_utime(fname, modtime, mod_nsec) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (force_change && errno == EPERM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && try_a_force_change(fname, modtime, mod_nsec, mode, fileflags) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fileflags = 0; /* avoid compiler warning */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/xattrs.c b/xattrs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/xattrs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/xattrs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1045,7 +1045,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | (S_ISDIR(fst.st_mode) ? 0700 : 0600);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fst.st_mode != mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- do_chmod(fname, mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ do_chmod(fname, mode, ST_FLAGS(fst));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!IS_DEVICE(fst.st_mode))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fst.st_rdev = 0; /* just in case */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nurp a/config.h.in b/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,6 +76,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define to 1 if vsprintf has a C99-compatible return value */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef HAVE_C99_VSNPRINTF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Define to 1 if you have the `chflags' function. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef HAVE_CHFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define to 1 if you have the `chmod' function. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef HAVE_CHMOD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nurp a/configure.sh b/configure.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7687,6 +7687,7 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ac_func in waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fchmod fstat ftruncate strchr readlink link utime utimes lutimes strftime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ chflags \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memmove lchown vsnprintf snprintf vasprintf asprintf setsid strpbrk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nurp a/proto.h b/proto.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/proto.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/proto.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -287,6 +287,8 @@ int read_ndx_and_attrs(int f_in, int f_o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void free_sums(struct sum_struct *s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int exists);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int make_mutable(const char *fname, mode_t mode, uint32 fileflags, uint32 iflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int undo_make_mutable(const char *fname, uint32 fileflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *fnamecmp, int flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void sig_int(int sig_num);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,11 +313,12 @@ int do_unlink(const char *fname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_symlink(const char *lnk, const char *fname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t do_readlink(const char *path, char *buf, size_t bufsiz);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_link(const char *fname1, const char *fname2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int do_lchown(const char *path, uid_t owner, gid_t group);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int do_lchown(const char *path, uid_t owner, gid_t group, mode_t mode, uint32 fileflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_mknod(const char *pathname, mode_t mode, dev_t dev);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_rmdir(const char *pathname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_open(const char *pathname, int flags, mode_t mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int do_chmod(const char *path, mode_t mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int do_chmod(const char *path, mode_t mode, uint32 fileflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int do_chflags(const char *path, uint32 fileflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_rename(const char *fname1, const char *fname2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int do_ftruncate(int fd, OFF_T size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void trim_trailing_slashes(char *name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -354,7 +357,7 @@ void set_nonblocking(int fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void set_blocking(int fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int fd_pair(int fd[2]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void print_child_argv(const char *prefix, char **cmd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int make_path(char *fname, int flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int full_write(int desc, const char *ptr, size_t len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int copy_file(const char *source, const char *dest, int ofd, mode_t mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nurp a/rsync.1 b/rsync.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/rsync.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rsync.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -438,6 +438,7 @@ to the detailed description below for a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-K, \-\-keep\-dirlinks treat symlinked dir on receiver as dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-H, \-\-hard\-links preserve hard links
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-p, \-\-perms preserve permissions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ \-\-fileflags preserve file\-flags (aka chflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-E, \-\-executability preserve executability
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-\-chmod=CHMOD affect file and/or directory permissions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-A, \-\-acls preserve ACLs (implies \-p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -473,7 +474,10 @@ to the detailed description below for a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-\-ignore\-missing\-args ignore missing source args without error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-\-delete\-missing\-args delete missing source args from destination
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-\-ignore\-errors delete even if there are I/O errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- \-\-force force deletion of dirs even if not empty
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ \-\-force\-delete force deletion of dirs even if not empty
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ \-\-force\-change affect user/system immutable files/dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ \-\-force\-uchange affect user\-immutable files/dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ \-\-force\-schange affect system\-immutable files/dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-\-max\-delete=NUM don'\&t delete more than NUM files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-\-max\-size=SIZE don'\&t transfer any file larger than SIZE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-\-min\-size=SIZE don'\&t transfer any file smaller than SIZE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -745,7 +749,8 @@ specified, in which case \fB\-r\fP is no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Note that \fB\-a\fP \fBdoes not preserve hardlinks\fP, because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ finding multiply\-linked files is expensive. You must separately
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-specify \fB\-H\fP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++specify \fB\-H\fP. Note also that for backward compatibility, \fB\-a\fP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++currently does \fBnot\fP imply the \fB\-\-fileflags\fP option.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP "\-\-no\-OPTION"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You may turn off one or more implied options by prefixing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1087,7 +1092,7 @@ they would be using \fB\-\-copy\-links\f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Without this option, if the sending side has replaced a directory with a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ symlink to a directory, the receiving side will delete anything that is in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the way of the new symlink, including a directory hierarchy (as long as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-\fB\-\-force\fP or \fB\-\-delete\fP is in effect).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++\fB\-\-force\-delete\fP or \fB\-\-delete\fP is in effect).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ See also \fB\-\-keep\-dirlinks\fP for an analogous option for the receiving
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ side.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1274,6 +1279,33 @@ Note that this option does not copy rsyn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ used by \fB\-\-fake\-super\fP) unless you repeat the option (e.g. \-XX). This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \(dq\© all xattrs\(dq\& mode cannot be used with \fB\-\-fake\-super\fP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP "\fB\-\-fileflags\fP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option causes rsync to update the file\-flags to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++the same as the source files and directories (if your OS supports the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++\fBchflags\fP(2) system call). Some flags can only be altered by the super\-user
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++and some might only be unset below a certain secure\-level (usually single\-user
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++mode). It will not make files alterable that are set to immutable on the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++receiver. To do that, see \fB\-\-force\-change\fP, \fB\-\-force\-uchange\fP, and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++\fB\-\-force\-schange\fP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP "\fB\-\-force\-change\fP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option causes rsync to disable both user\-immutable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++and system\-immutable flags on files and directories that are being updated or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++deleted on the receiving side. This option overrides \fB\-\-force\-uchange\fP and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++\fB\-\-force\-schange\fP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP "\fB\-\-force\-uchange\fP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option causes rsync to disable user\-immutable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++flags on files and directories that are being updated or deleted on the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++receiving side. It does not try to affect system flags. This option overrides
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++\fB\-\-force\-change\fP and \fB\-\-force\-schange\fP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP "\fB\-\-force\-schange\fP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option causes rsync to disable system\-immutable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++flags on files and directories that are being updated or deleted on the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++receiving side. It does not try to affect user flags. This option overrides
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++\fB\-\-force\-change\fP and \fB\-\-force\-uchange\fP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP "\fB\-\-chmod\fP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This option tells rsync to apply one or more
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ comma\-separated \(dq\&chmod\(dq\& modes to the permission of the files in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1640,13 +1672,14 @@ display as a \(dq\&*missing\(dq\& entry
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tells \fB\-\-delete\fP to go ahead and delete files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ even when there are I/O errors.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.IP "\fB\-\-force\fP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP "\fB\-\-force\-delete\fP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This option tells rsync to delete a non\-empty directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ when it is to be replaced by a non\-directory. This is only relevant if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deletions are not active (see \fB\-\-delete\fP for details).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Note for older rsync versions: \fB\-\-force\fP used to still be required when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-using \fB\-\-delete\-after\fP, and it used to be non\-functional unless the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option can be abbreviated \fB\-\-force\fP for backward compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Note that some older rsync versions used to still require \fB\-\-force\fP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++when using \fB\-\-delete\-after\fP, and it used to be non\-functional unless the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \fB\-\-recursive\fP option was also enabled.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP "\fB\-\-max\-delete=NUM\fP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2364,7 +2397,7 @@ with older versions of rsync, but that a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ verbose messages).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The \(dq\&%i\(dq\& escape has a cryptic output that is 11 letters long. The general
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-format is like the string \fBYXcstpoguax\fP, where \fBY\fP is replaced by the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++format is like the string \fBYXcstpogfax\fP, where \fBY\fP is replaced by the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type of update being done, \fBX\fP is replaced by the file\-type, and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ other letters represent attributes that may be output if they are being
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modified.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2434,7 +2467,7 @@ sender\(cq\&s value (requires \fB\-\-own
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ A \fBg\fP means the group is different and is being updated to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sender\(cq\&s value (requires \fB\-\-group\fP and the authority to set the group).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-The \fBu\fP slot is reserved for future use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++The \fBf\fP means that the fileflags information changed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The \fBa\fP means that the ACL information changed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP o
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/rsync-hfscomp/files/patch-hfs-compression-options.diff b/net/rsync-hfscomp/files/patch-hfs-compression-options.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a37065be9ad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/rsync-hfscomp/files/patch-hfs-compression-options.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/options.c b/options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -577,6 +577,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char const *iconv = "no ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char const *ipv6 = "no ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char const *fileflags = "no ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char const *hfscomp = "no";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRUCT_STAT *dumstat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if SUBPROTOCOL_VERSION != 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -616,6 +617,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fileflags = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hfscomp = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(f, "%s version %s protocol version %d%s\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -629,8 +633,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (int)(sizeof (int64) * 8));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ got_socketpair, hardlinks, links, ipv6, have_inplace);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sprealloc, %sfile-flags\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sprealloc, %sfile-flags,\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_inplace, acls, xattrs, iconv, symtimes, prealloc, fileflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(f, " %sHFS-compression\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hfscomp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef MAINTAINER_MODE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/rsync-hfscomp/files/patch-hfs-compression.diff b/net/rsync-hfscomp/files/patch-hfs-compression.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c9ed27899be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/rsync-hfscomp/files/patch-hfs-compression.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,810 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This patch adds support for HFS+ compression.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Written by Mike Bombich. Taken from http://www.bombich.com/rsync.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Modified by Wayne to fix some issues and tweak the implementation a bit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This compiles on OS X and passes the testsuite, but otherwise UNTESTED!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To use this patch, run these commands for a successful build:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch -p1 <patches/fileflags.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch -p1 <patches/crtimes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch -p1 <patches/hfs-compression.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./prepare-source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+TODO:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - Should rsync try to treat the compressed data as file data and use the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rsync algorithm on the data transfer?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+based-on: patch/master/crtimes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/flist.c b/flist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/flist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/flist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ #ifdef SUPPORT_XATTRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_xattrs) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sx.st.st_mode = file->mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sx.st.st_flags = F_FFLAGS(file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sx.st.st_mtime = file->modtime; /* get_xattr needs mtime for decmpfs xattrs */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (get_xattr(fname, &sx) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ io_error |= IOERR_GENERAL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/generator.c b/generator.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generator.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generator.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,6 +37,7 @@ extern int implied_dirs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int keep_dirlinks;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_acls;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_xattrs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int preserve_hfs_compression;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_links;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_devices;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_specials;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ fname, fnamecmpbuf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sx.st.st_size = F_LENGTH(fuzzy_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sx.st.st_flags & UF_COMPRESSED) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_hfs_compression)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sx.st.st_size = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sx.st.st_flags &= ~UF_COMPRESSED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ statret = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fnamecmp = fnamecmpbuf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ if (read_batch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto cleanup;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (F_FFLAGS(file) & UF_COMPRESSED) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* 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:#e0ffe0;'>++ * If my filesystem doesn't support HFS compression, the existing file's content
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * will not be automatically truncated, so we'll do that manually here */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_hfs_compression && sx.st.st_size > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ftruncate(fd, 0) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sx.st.st_size = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (statret != 0 || whole_file)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write_sum_head(f_out, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (sx.st.st_size <= 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/sysxattrs.c b/lib/sysxattrs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/sysxattrs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/sysxattrs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,10 +22,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "rsync.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "sysxattrs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int preserve_hfs_compression;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_XATTRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_OSX_XATTRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef XATTR_SHOWCOMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define XATTR_SHOWCOMPRESSION 0x0020
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GETXATTR_FETCH_LIMIT (64*1024*1024)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int xattr_options = XATTR_NOFOLLOW;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined HAVE_LINUX_XATTRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ssize_t len = getxattr(path, name, value, size, 0, XATTR_NOFOLLOW);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_hfs_compression)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xattr_options |= XATTR_SHOWCOMPRESSION;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ len = getxattr(path, name, value, size, 0, xattr_options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* If we're retrieving data, handle resource forks > 64MB specially */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (value != NULL && len == GETXATTR_FETCH_LIMIT && (size_t)len < size) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ u_int32_t offset = len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t data_retrieved = len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (data_retrieved < size) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- len = getxattr(path, name, value + offset, size - data_retrieved, offset, XATTR_NOFOLLOW);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ len = getxattr(path, name, value + offset, size - data_retrieved, offset, xattr_options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (len <= 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data_retrieved += len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int sys_lremovexattr(const char *path, const char *name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return removexattr(path, name, XATTR_NOFOLLOW);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_hfs_compression)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xattr_options |= XATTR_SHOWCOMPRESSION;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return removexattr(path, name, xattr_options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t sys_llistxattr(const char *path, char *list, size_t size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return listxattr(path, list, size, XATTR_NOFOLLOW);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_hfs_compression)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xattr_options |= XATTR_SHOWCOMPRESSION;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return listxattr(path, list, size, xattr_options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif HAVE_FREEBSD_XATTRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/main.c b/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,6 +29,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_FORCE_CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/sysctl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/attr.h> /* For getattrlist() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/mount.h> /* For statfs() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int dry_run;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int list_only;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,6 +57,7 @@ extern int copy_dirlinks;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int copy_unsafe_links;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int keep_dirlinks;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_hard_links;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int preserve_hfs_compression;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int protocol_version;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int force_change;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int file_total;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,6 +113,7 @@ int daemon_over_rsh = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mode_t orig_umask = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int batch_gen_fd = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int sender_keeps_checksum = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int fs_supports_hfs_compression = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* There's probably never more than at most 2 outstanding child processes,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * but set it higher, just in case. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ return 0; /* not reached */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void hfs_receiver_check(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct statfs fsb;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct attrlist attrs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int32_t len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vol_capabilities_set_t caps;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } attrData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_hfs_compression != 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return; /* Nothing to check if --hfs-compression option isn't enabled. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (statfs(".", &fsb) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rsyserr(FERROR, errno, "statfs %s failed", curr_dir);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit_cleanup(RERR_FILESELECT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bzero(&attrs, sizeof attrs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ attrs.bitmapcount = ATTR_BIT_MAP_COUNT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ attrs.volattr = ATTR_VOL_CAPABILITIES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bzero(&attrData, sizeof attrData);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ attrData.len = sizeof attrData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (getattrlist(fsb.f_mntonname, &attrs, &attrData, sizeof attrData, 0) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rsyserr(FERROR, errno, "getattrlist %s failed", curr_dir);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit_cleanup(RERR_FILESELECT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!(attrData.caps[VOL_CAPABILITIES_FORMAT] & VOL_CAP_FMT_DECMPFS_COMPRESSION)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(FERROR, "The destination filesystem does not support HFS+ compression.\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit_cleanup(RERR_UNSUPPORTED);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* The receiving side operates in one of two modes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * 1. it receives any number of files into a destination directory,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ exit_cleanup(RERR_FILESELECT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filesystem_dev = st.st_dev; /* ensures --force works right w/-x */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hfs_receiver_check();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (file_total > 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ full_fname(dest_path));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit_cleanup(RERR_FILESELECT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hfs_receiver_check();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ full_fname(dest_path));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit_cleanup(RERR_FILESELECT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hfs_receiver_check();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *cp = '/';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return cp + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/options.c b/options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/options.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,6 +54,7 @@ int preserve_links = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_hard_links = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_acls = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_xattrs = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int preserve_hfs_compression = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_perms = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_fileflags = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_executability = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -711,6 +712,10 @@ void usage(enum logcode F)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SUPPORT_XATTRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," -X, --xattrs preserve extended attributes\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(F," --hfs-compression preserve HFS compression if supported\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(F," --protect-decmpfs preserve HFS compression as xattrs\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," -o, --owner preserve owner (super-user only)\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," -g, --group preserve group\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rprintf(F," --devices preserve device files (super-user only)\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -972,6 +977,12 @@ static struct poptOption long_options[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"force-uchange", 0, POPT_ARG_VAL, &force_change, USR_IMMUTABLE, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"force-schange", 0, POPT_ARG_VAL, &force_change, SYS_IMMUTABLE, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"hfs-compression", 0, POPT_ARG_VAL, &preserve_hfs_compression, 1, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"no-hfs-compression",0, POPT_ARG_VAL, &preserve_hfs_compression, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"protect-decmpfs", 0, POPT_ARG_VAL, &preserve_hfs_compression, 2, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"no-protect-decmpfs",0, POPT_ARG_VAL, &preserve_hfs_compression, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 1, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"no-ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1972,6 +1983,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_hfs_compression) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!preserve_xattrs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ preserve_xattrs = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!preserve_fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ preserve_fileflags = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (block_size > MAX_BLOCK_SIZE) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ snprintf(err_buf, sizeof err_buf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "--block-size=%lu is too large (max: %u)\n", block_size, MAX_BLOCK_SIZE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2575,6 +2595,11 @@ void server_options(char **args, int *argc_p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (preserve_fileflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args[ac++] = "--fileflags";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_hfs_compression)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args[ac++] = preserve_hfs_compression == 1 ? "--hfs-compression" : "--protect-decmpfs";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto oom;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/rsync.c b/rsync.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/rsync.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rsync.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ #ifdef SUPPORT_XATTRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (am_root < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_stat_xattr(fname, file, new_mode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (preserve_xattrs && fnamecmp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_xattrs && fnamecmp) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32 tmpflags = sxp->st.st_flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sxp->st.st_flags = F_FFLAGS(file); /* set_xattr() needs to check UF_COMPRESSED */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_xattr(fname, file, fnamecmp, sxp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sxp->st.st_flags = tmpflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (S_ISDIR(sxp->st.st_mode))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ link_stat(fname, &sx2.st, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!preserve_times
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ if (sxp->st.st_ino == 2 && S_ISDIR(sxp->st.st_mode))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags |= ATTRS_SKIP_CRTIME;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(flags & ATTRS_SKIP_MTIME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && !(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:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && (sxp->st.st_mtime != file->modtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef ST_MTIME_NSEC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (NSEC_BUMP(file) && (uint32)sxp->st.ST_MTIME_NSEC != F_MOD_NSEC(file))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ && !set_fileflags(fname, fileflags))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto cleanup;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ updated = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), new_mode, fileflags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ret < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rsyserr(FERROR_XFER, errno, "failed to set times on %s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ full_fname(fname));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ goto cleanup;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ret != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ file->flags |= FLAG_TIME_FAILED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/rsync.h b/rsync.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/rsync.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rsync.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -549,6 +549,17 @@ typedef unsigned int size_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ST_FLAGS(st) NO_FFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef UF_COMPRESSED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define UF_COMPRESSED 0x00000020
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef VOL_CAP_FMT_DECMPFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define VOL_CAP_FMT_DECMPFS_COMPRESSION 0x00010000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined SUPPORT_XATTRS && defined SUPPORT_FILEFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SUPPORT_HFS_COMPRESSION 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Find a variable that is either exactly 32-bits or longer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * If some code depends on 32-bit truncation, it will need to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * take special action in a "#if SIZEOF_INT32 > 4" section. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/rsync.yo b/rsync.yo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/rsync.yo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rsync.yo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -367,6 +367,8 @@ to the detailed description below for a complete description. verb(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --chmod=CHMOD affect file and/or directory permissions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -A, --acls preserve ACLs (implies -p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -X, --xattrs preserve extended attributes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ --hfs-compression preserve HFS compression if supported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ --protect-decmpfs preserve HFS compression as xattrs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -o, --owner preserve owner (super-user only)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -g, --group preserve group
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --devices preserve device files (super-user only)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ receiving side. It does not try to affect user flags. This option overrides
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bf(--force-change) and bf(--force-uchange).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dit(bf(--hfs-compression)) This option causes rsync to preserve HFS+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++compression if the destination filesystem supports it. If the destination
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++does not support it, rsync will exit with an error.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Filesystem compression was introduced to HFS+ in Mac OS 10.6. A file that is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++compressed has no data in its data fork. Rather, the compressed data is stored
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++in an extended attribute named com.apple.decmpfs and a file flag is set to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++indicate that the file is compressed (UF_COMPRESSED). HFS+ decompresses this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++data "on-the-fly" and presents it to the operating system as a normal file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Normal attempts to copy compressed files (e.g. in the Finder, via cp, ditto,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++etc.) will copy the file's decompressed contents, remove the UF_COMPRESSED file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++flag, and discard the com.apple.decmpfs extended attribute. This option will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++preserve the data in the com.apple.decmpfs extended attribute and ignore the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++synthesized data in the file contents.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option implies both bf(--fileflags) and (--xattrs).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dit(bf(--protect-decmpfs)) The com.apple.decmpfs extended attribute is hidden
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++by default from list/get xattr calls, therefore normal attempts to copy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++compressed files will functionally decompress those files. While this is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++desirable behavior when copying files to filesystems that do not support HFS+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++compression, it has serious performance and capacity impacts when backing up
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++or restoring the Mac OS X filesystem.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option will transfer the com.apple.decmpfs extended attribute regardless
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++of support on the destination. If a source file is compressed and an existing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++file on the destination is not compressed, the data fork of the destination
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++file will be truncated and the com.apple.decmpfs xattr will be transferred
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++instead. Note that compressed files will not be readable to the operating
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++system of the destination if that operating system does not support HFS+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++compression. Once restored (with or without this option) to an operating system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++that supports HFS+ compression, however, these files will be accessible as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++usual.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option implies bf(--fileflags) and bf(--xattrs).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dit(bf(--chmod)) This option tells rsync to apply one or more
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ comma-separated "chmod" modes to the permission of the files in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transfer. The resulting value is treated as though it were the permissions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/t_stub.c b/t_stub.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/t_stub.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/t_stub.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,6 +32,7 @@ int force_change = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_acls = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_times = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int preserve_xattrs = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int preserve_hfs_compression = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *partial_dir;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *module_dir;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filter_rule_list daemon_filter_list;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/xattrs.c b/xattrs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/xattrs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/xattrs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,7 @@ extern int am_generator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int read_only;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int list_only;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_xattrs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int preserve_hfs_compression;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_links;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_devices;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int preserve_specials;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,6 +42,10 @@ extern int checksum_seed;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RSYNC_XAL_INITIAL 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RSYNC_XAL_LIST_INITIAL 100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GXD_NO_MISSING_ERROR (1<<0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GXD_OMIT_COMPRESSED (1<<1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GXD_FILE_IS_COMPRESSED (1<<2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MAX_FULL_DATUM 32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAS_PREFIX(str, prfx) (*(str) == *(prfx) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,6 +78,17 @@ extern int checksum_seed;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XDEF_ACL_SUFFIX "dacl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XDEF_ACL_ATTR RSYNC_PREFIX "%" XDEF_ACL_SUFFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define APPLE_PREFIX "com.apple."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define APLPRE_LEN ((int)sizeof APPLE_PREFIX - 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define DECMPFS_SUFFIX "decmpfs"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RESOURCEFORK_SUFFIX "ResourceFork"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define UNREAD_DATA ((char *)1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAX_DIGEST_LEN < SIZEOF_TIME_T
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#error MAX_DIGEST_LEN is too small to hold an mtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *datum, *name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t datum_len, name_len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,8 +183,7 @@ static ssize_t get_xattr_names(const char *fname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* On entry, the *len_ptr parameter contains the size of the extra space we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * should allocate when we create a buffer for the data. On exit, it contains
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the length of the datum. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int no_missing_error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++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:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t datum_len = sys_lgetxattr(fname, name, NULL, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t extra_len = *len_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ *len_ptr = datum_len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (datum_len == (size_t)-1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (errno == ENOTSUP || no_missing_error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (errno == ENOTSUP || flags & GXD_NO_MISSING_ERROR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rsyserr(FERROR_XFER, errno,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "get_xattr_data: lgetxattr(\"%s\",\"%s\",0) failed",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (flags & GXD_OMIT_COMPRESSED && datum_len > MAX_FULL_DATUM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && HAS_PREFIX(name, APPLE_PREFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && (strcmp(name+APLPRE_LEN, DECMPFS_SUFFIX) == 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ || (flags & GXD_FILE_IS_COMPRESSED && strcmp(name+APLPRE_LEN, RESOURCEFORK_SUFFIX) == 0))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* If we are omitting compress-file-related data, we don't want to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * actually read this data. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return UNREAD_DATA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!datum_len && !extra_len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_len = 1; /* request non-zero amount of memory */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (datum_len + extra_len < datum_len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ return ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static int rsync_xal_get(const char *fname, item_list *xalp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++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:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (datum == UNREAD_DATA) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* For abbreviated compressed data, we store the file's mtime as the checksum. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SIVAL(sum, 0, sxp->st.st_mtime);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if SIZEOF_TIME_T > 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SIVAL(sum, 4, sxp->st.st_mtime >> 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAX_DIGEST_LEN > 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memset(sum + 8, 0, MAX_DIGEST_LEN - 8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAX_DIGEST_LEN > 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memset(sum + 4, 0, MAX_DIGEST_LEN - 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sum_init(checksum_seed);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sum_update(datum, datum_len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sum_end(sum);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int rsync_xal_get(const char *fname, stat_x *sxp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t list_len, name_len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t datum_len, name_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -222,7 +268,8 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int user_only = am_sender ? 0 : !am_root;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rsync_xa *rxa;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int count, flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ item_list *xalp = sxp->xattr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* This puts the name list into the "namebuf" buffer. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((list_len = get_xattr_names(fname)) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -252,20 +299,22 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ datum_len = name_len; /* Pass extra size to get_xattr_data() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!(ptr = get_xattr_data(fname, name, &datum_len, 0)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags = GXD_OMIT_COMPRESSED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_hfs_compression && sxp->st.st_flags & UF_COMPRESSED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags |= GXD_FILE_IS_COMPRESSED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!(ptr = get_xattr_data(fname, name, &datum_len, flags)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (datum_len > MAX_FULL_DATUM) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* For large datums, we store a flag and a checksum. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *datum = ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name_offset = 1 + MAX_DIGEST_LEN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sum_init(checksum_seed);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sum_update(ptr, datum_len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- free(ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(ptr = new_array(char, name_offset + name_len)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ out_of_memory("rsync_xal_get");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *ptr = XSTATE_ABBREV;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sum_end(ptr + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ checksum_xattr_data(ptr+1, datum, datum_len, sxp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (datum != UNREAD_DATA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(datum);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name_offset = datum_len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,7 +360,7 @@ int get_xattr(const char *fname, stat_x *sxp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (IS_MISSING_FILE(sxp->st))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (rsync_xal_get(fname, sxp->xattr) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (rsync_xal_get(fname, sxp) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free_xattr(sxp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -346,6 +395,8 @@ int copy_xattrs(const char *source, const char *dest)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ datum_len = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(ptr = get_xattr_data(source, name, &datum_len, 0)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ptr == UNREAD_DATA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ continue; /* XXX Is this right? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sys_lsetxattr(dest, name, ptr, datum_len) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int save_errno = errno ? errno : EINVAL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rsyserr(FERROR_XFER, errno,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -362,6 +413,10 @@ int copy_xattrs(const char *source, const char *dest)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int find_matching_xattr(item_list *xalp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_OSX_XATTRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xalp = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1; /* find_matching_xattr is a waste of cycles for MOSX clients */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t i, j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ item_list *lst = rsync_xal_l.items;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -395,6 +450,7 @@ static int find_matching_xattr(item_list *xalp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Store *xalp on the end of rsync_xal_l */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Re-read the long datum. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(ptr = get_xattr_data(fname, rxa->name, &len, 0))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rprintf(FERROR_XFER, "failed to re-read xattr %s for %s\n", rxa->name, fname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (errno != ENOTSUP && errno != ENOATTR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rprintf(FERROR_XFER, "failed to re-read xattr %s for %s\n", rxa->name, fname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write_varint(f_out, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ assert(ptr != UNREAD_DATA);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write_varint(f_out, len); /* length might have changed! */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write_bigbuf(f_out, ptr, len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -795,7 +853,7 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int user_only = am_root <= 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t name_len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int ret = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int flags, ret = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* This puts the current name list into the "namebuf" buffer. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((list_len = get_xattr_names(fname)) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -807,7 +865,10 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (XATTR_ABBREV(rxas[i])) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* See if the fnamecmp version is identical. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ len = name_len = rxas[i].name_len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((ptr = get_xattr_data(fnamecmp, name, &len, 1)) == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags = GXD_OMIT_COMPRESSED | GXD_NO_MISSING_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_hfs_compression && sxp->st.st_flags & UF_COMPRESSED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags |= GXD_FILE_IS_COMPRESSED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((ptr = get_xattr_data(fnamecmp, name, &len, flags)) == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ still_abbrev:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (am_generator)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -816,14 +877,14 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ptr == UNREAD_DATA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ continue; /* XXX Is this right? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (len != rxas[i].datum_len) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto still_abbrev;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sum_init(checksum_seed);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sum_update(ptr, len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sum_end(sum);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ checksum_xattr_data(sum, ptr, len, sxp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (memcmp(sum, rxas[i].datum + 1, MAX_DIGEST_LEN) != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto still_abbrev;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -892,6 +953,10 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_OSX_XATTRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rsync_xal_free(xalp); /* Free this because we aren't using find_matching_xattr(). */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *name = is_access_acl ? XACC_ACL_ATTR : XDEF_ACL_ATTR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *len_p = 0; /* no extra data alloc needed from get_xattr_data() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return get_xattr_data(fname, name, len_p, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return get_xattr_data(fname, name, len_p, GXD_NO_MISSING_ERROR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static inline void hfs_compress_tweaks(STRUCT_STAT *fst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (fst->st_flags & UF_COMPRESSED) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (preserve_hfs_compression) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* We're sending the compression xattr, not the decompressed data fork.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Setting rsync's idea of the file size to 0 effectively prevents the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * transfer of the data fork. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fst->st_size = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* If the sender's filesystem supports compression, then we'll be able
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * to send the decompressed data fork and the decmpfs xattr will be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * hidden (not sent). As such, we need to strip the compression flag. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fst->st_flags &= ~UF_COMPRESSED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int x_stat(const char *fname, STRUCT_STAT *fst, STRUCT_STAT *xst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ret = do_stat(fname, fst);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((ret < 0 || get_stat_xattr(fname, -1, fst, xst) < 0) && xst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xst->st_mode = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hfs_compress_tweaks(fst);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ int ret = do_lstat(fname, fst);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((ret < 0 || get_stat_xattr(fname, -1, fst, xst) < 0) && xst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xst->st_mode = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hfs_compress_tweaks(fst);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1102,6 +1192,9 @@ int x_fstat(int fd, STRUCT_STAT *fst, STRUCT_STAT *xst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ret = do_fstat(fd, fst);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((ret < 0 || get_stat_xattr(NULL, fd, fst, xst) < 0) && xst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xst->st_mode = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SUPPORT_HFS_COMPRESSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hfs_compress_tweaks(fst);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Nurp a/rsync.1 b/rsync.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/rsync.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rsync.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -443,6 +443,8 @@ to the detailed description below for a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-\-chmod=CHMOD affect file and/or directory permissions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-A, \-\-acls preserve ACLs (implies \-p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-X, \-\-xattrs preserve extended attributes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ \-\-hfs\-compression preserve HFS compression if supported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ \-\-protect\-decmpfs preserve HFS compression as xattrs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-o, \-\-owner preserve owner (super\-user only)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-g, \-\-group preserve group
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \-\-devices preserve device files (super\-user only)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1307,6 +1309,44 @@ flags on files and directories that are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ receiving side. It does not try to affect user flags. This option overrides
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \fB\-\-force\-change\fP and \fB\-\-force\-uchange\fP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP "\fB\-\-hfs\-compression\fP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option causes rsync to preserve HFS+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++compression if the destination filesystem supports it. If the destination
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++does not support it, rsync will exit with an error.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Filesystem compression was introduced to HFS+ in Mac OS 10.6. A file that is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++compressed has no data in its data fork. Rather, the compressed data is stored
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++in an extended attribute named com.apple.decmpfs and a file flag is set to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++indicate that the file is compressed (UF_COMPRESSED). HFS+ decompresses this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++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:#e0ffe0;'>++Normal attempts to copy compressed files (e.g. in the Finder, via cp, ditto,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++etc.) will copy the file\(cq\&s decompressed contents, remove the UF_COMPRESSED file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++flag, and discard the com.apple.decmpfs extended attribute. This option will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++preserve the data in the com.apple.decmpfs extended attribute and ignore the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++synthesized data in the file contents.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option implies both \fB\-\-fileflags\fP and (\-\-xattrs).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP "\fB\-\-protect\-decmpfs\fP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++The com.apple.decmpfs extended attribute is hidden
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++by default from list/get xattr calls, therefore normal attempts to copy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++compressed files will functionally decompress those files. While this is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++desirable behavior when copying files to filesystems that do not support HFS+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++compression, it has serious performance and capacity impacts when backing up
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++or restoring the Mac OS X filesystem.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option will transfer the com.apple.decmpfs extended attribute regardless
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++of support on the destination. If a source file is compressed and an existing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++file on the destination is not compressed, the data fork of the destination
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++file will be truncated and the com.apple.decmpfs xattr will be transferred
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++instead. Note that compressed files will not be readable to the operating
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++system of the destination if that operating system does not support HFS+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++compression. Once restored (with or without this option) to an operating system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++that supports HFS+ compression, however, these files will be accessible as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++usual.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option implies \fB\-\-fileflags\fP and \fB\-\-xattrs\fP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.IP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP "\fB\-\-chmod\fP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This option tells rsync to apply one or more
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ comma\-separated \(dq\&chmod\(dq\& modes to the permission of the files in the
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/rsync-hfscomp/files/rsyncd.conf.example b/net/rsync-hfscomp/files/rsyncd.conf.example
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0e604729bfd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/rsync-hfscomp/files/rsyncd.conf.example
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Sample rsyncd configuration file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# You must rename it rsyncd.conf to use it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+log file=__PREFIX__/var/log/rsyncd.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pid file=__PREFIX__/var/run/rsyncd.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+read only=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use chroot=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+list=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Specify the modules you want to use here. See "man rsyncd.conf" for more
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# information.
</span></pre><pre style='margin:0'>
</pre>