Ticket #44117: rsync-3.1.1-final.patch

rsync/Portfile

@@ -4 +4 @@
 PortSystem          1.0
 
 name                rsync
-version             3.0.9
-revision            2
+version             3.1.1
+revision            0
 categories          net
 license             GPL-3+
 installs_libs       no
@@ -21 +21 @@
 master_sites        http://rsync.samba.org/ftp/rsync/ \
                     http://rsync.samba.org/ftp/rsync/src/
 
-checksums           md5     5ee72266fe2c1822333c407e1761b92b \
-                    sha1    c64c8341984aea647506eb504496999fd968ddfc \
-                    rmd160  e5ee8d786defb0d8f937c8d027466f418c63c97e \
-                    sha256  30f10f8dd5490d28240d4271bb652b1da7a60b22ed2b9ae28090668de9247c05
+checksums           md5     43bd6676f0b404326eee2d63be3cdcfe \
+                    sha1    c84faba04f721d393feccfa0476bfeed9b5b5250 \
+                    rmd160  de7ad955cb05d481a963aa30423790f3d82efe7b \
+                    sha256  7de4364fcf5fe42f3bdb514417f1c40d10bbca896abe7e7f2c581c6ea08a2621
 
 depends_lib         port:popt port:libiconv
 
-# these come from http://rsync.samba.org/ftp/rsync/rsync-patches-3.0.9.tar.gz
+# these come from http://rsync.samba.org/ftp/rsync/rsync-patches-3.1.1.tar.gz
 # and need to be updated with each release
 patchfiles          patch-fileflags.diff \
                     patch-crtimes.diff \
@@ -38 +38 @@
 patch.pre_args      -p1
 
 configure.args      --with-rsyncd-conf=${prefix}/etc/rsyncd.conf
-configure.cflags   "-Os -I${prefix}/include"
 
 pre-configure {
     system "cd ${worksrcpath}; ./prepare-source"

rsync/files/patch-crtimes.diff

@@ -9 +9 @@
     ./configure
     make
 
-based-on: patch/b3.0.x/fileflags
+based-on: patch/master/fileflags
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
-@@ -47,6 +47,7 @@ extern int force_change;
+@@ -48,6 +48,7 @@ extern int force_change;
  extern int protect_args;
  extern int preserve_uid;
  extern int preserve_gid;
@@ -21 +21 @@
  extern int preserve_fileflags;
  extern int preserve_acls;
  extern int preserve_xattrs;
-@@ -65,7 +66,7 @@ extern char *iconv_opt;
+@@ -66,7 +67,7 @@ extern char *iconv_opt;
  #endif
  
  /* These index values are for the file-list's extra-attribute array. */
@@ -30 +30 @@
  
  int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
  int sender_symlink_iconv = 0;  /* sender should convert symlink content */
-@@ -142,6 +143,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -144,6 +145,8 @@ void setup_protocol(int f_out,int f_in)
                 uid_ndx = ++file_extra_cnt;
         if (preserve_gid)
                 gid_ndx = ++file_extra_cnt;
@@ -42 +42 @@
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -54,6 +54,7 @@ extern int preserve_specials;
- extern int preserve_fileflags;
+@@ -54,6 +54,7 @@ extern int preserve_fileflags;
  extern int delete_during;
+ extern int missing_args;
  extern int eol_nulls;
 +extern int crtimes_ndx;
  extern int relative_paths;
  extern int implied_dirs;
  extern int ignore_perishable;
-@@ -393,7 +394,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -398,7 +399,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
  #endif
                             int ndx, int first_ndx)
  {
@@ -59 +59 @@
         static mode_t mode;
  #ifdef SUPPORT_FILEFLAGS
         static uint32 fileflags;
-@@ -488,6 +489,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
-                xflags |= XMIT_SAME_TIME;
-        else
+@@ -509,6 +510,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
                 modtime = file->modtime;
+        if (NSEC_BUMP(file) && protocol_version >= 31)
+                xflags |= XMIT_MOD_NSEC;
 +       if (crtimes_ndx) {
 +               time_t file_crtime = f_crtime(file);
 +               if (file_crtime == modtime)
@@ -73 +73 @@
  
  #ifdef SUPPORT_HARD_LINKS
         if (tmp_dev != -1) {
-@@ -557,6 +565,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
-                else
-                        write_int(f, modtime);
+@@ -593,6 +601,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
         }
+        if (xflags & XMIT_MOD_NSEC)
+                write_varint(f, F_MOD_NSEC(file));
 +       if (crtimes_ndx && !(xflags & XMIT_CRTIME_EQ_MTIME))
 +               write_varlong(f, crtime, 4);
         if (!(xflags & XMIT_SAME_MODE))
                 write_int(f, to_wire_mode(mode));
  #ifdef SUPPORT_FILEFLAGS
-@@ -648,7 +658,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -686,7 +696,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
  
  static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags)
  {
@@ -91 +91 @@
         static mode_t mode;
  #ifdef SUPPORT_FILEFLAGS
         static uint32 fileflags;
-@@ -758,6 +768,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
-                                uid = F_OWNER(first);
-                        if (preserve_gid)
-                                gid = F_GROUP(first);
-+                       if (crtimes_ndx)
-+                               crtime = f_crtime(first);
-                        if (preserve_devices && IS_DEVICE(mode)) {
-                                uint32 *devp = F_RDEV_P(first);
-                                rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
-@@ -786,6 +798,19 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
-                } else
-                        modtime = read_int(f);
-        }
+@@ -838,6 +848,19 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+                modtime_nsec = read_varint(f);
+        else
+                modtime_nsec = 0;
 +       if (crtimes_ndx) {
 +               if (!(xflags & XMIT_CRTIME_EQ_MTIME)) {
 +                       crtime = read_varlong(f, 4);
@@ -120 +111 @@
         if (!(xflags & XMIT_SAME_MODE))
                 mode = from_wire_mode(read_int(f));
  
-@@ -946,6 +971,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -1015,6 +1038,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
                 F_GROUP(file) = gid;
                 file->flags |= gid_flags;
         }
@@ -129 +120 @@
         if (unsort_ndx)
                 F_NDX(file) = flist->used + flist->ndx_start;
  
-@@ -1324,6 +1351,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1416,6 +1441,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
                 F_GROUP(file) = st.st_gid;
         if (am_generator && st.st_uid == our_uid)
                 file->flags |= FLAG_OWNED_BY_US;
@@ -141 +132 @@
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
-@@ -21,6 +21,7 @@
-  */
- 
- #include "rsync.h"
-+#include "ifuncs.h"
- 
- extern int verbose;
- extern int dry_run;
-@@ -41,6 +42,7 @@ extern int preserve_xattrs;
+@@ -40,6 +40,7 @@ extern int preserve_xattrs;
  extern int preserve_links;
  extern int preserve_devices;
  extern int preserve_specials;
@@ -157 +140 @@
  extern int preserve_hard_links;
  extern int preserve_executability;
  extern int preserve_fileflags;
-@@ -576,8 +578,15 @@ static void do_delete_pass(void)
+@@ -384,8 +385,15 @@ static void do_delete_pass(void)
                 rprintf(FINFO, "                    \r");
  }
  
@@ -174 +157 @@
         return cmp_time(sxp->st.st_mtime, file->modtime);
  }
  
-@@ -635,7 +644,7 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
+@@ -443,7 +451,7 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
  {
         if (S_ISLNK(file->mode)) {
  #ifdef CAN_SET_SYMLINK_TIMES
@@ -183 +166 @@
                         return 0;
  #endif
  #ifdef CAN_CHMOD_SYMLINK
-@@ -655,7 +664,7 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
+@@ -463,7 +471,7 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
                         return 0;
  #endif
         } else {
@@ -192 +175 @@
                         return 0;
                 if (perms_differ(file, sxp))
                         return 0;
-@@ -698,6 +707,12 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -506,6 +514,12 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
                  : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED)
                   && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
                         iflags |= ITEM_REPORT_TIME;
@@ -205 +188 @@
  #if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
                 if (S_ISLNK(file->mode)) {
                         ;
-@@ -1263,7 +1278,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
- 
+@@ -1130,6 +1144,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
  static void list_file_entry(struct file_struct *f)
  {
--       char permbuf[PERMSTRING_SIZE];
-+       char permbuf[PERMSTRING_SIZE], crtime_buf[32];
-        double len;
- 
-        if (!F_IS_ACTIVE(f)) {
-@@ -1274,19 +1289,24 @@ static void list_file_entry(struct file_struct *f)
-        permstring(permbuf, f->mode);
-        len = F_LENGTH(f);
+        char permbuf[PERMSTRING_SIZE];
++       time_t crtime = crtimes_ndx ? f_crtime(f) : 0;
+        int64 len;
+        int colwidth = human_readable ? 14 : 11;
  
-+       if (crtimes_ndx)
-+               snprintf(crtime_buf, sizeof crtime_buf, " %s", timestring(f_crtime(f)));
-+       else
-+               *crtime_buf = '\0';
-+
-        /* TODO: indicate '+' if the entry has an ACL. */
+@@ -1145,10 +1160,12 @@ static void list_file_entry(struct file_struct *f)
  
  #ifdef SUPPORT_LINKS
         if (preserve_links && S_ISLNK(f->mode)) {
--               rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
-+               rprintf(FINFO, "%s %11.0f %s%s %s -> %s\n",
-                        permbuf, len, timestring(f->modtime),
--                       f_name(f, NULL), F_SYMLINK(f));
-+                       crtime_buf, f_name(f, NULL), F_SYMLINK(f));
+-               rprintf(FINFO, "%s %*s %s %s -> %s\n",
++               rprintf(FINFO, "%s %*s %s%s%s %s -> %s\n",
+                        permbuf, colwidth, human_num(len),
+-                       timestring(f->modtime), f_name(f, NULL),
+-                       F_SYMLINK(f));
++                       timestring(f->modtime),
++                       crtimes_ndx ? " " : "",
++                       crtimes_ndx ? timestring(crtime) : "",
++                       f_name(f, NULL), F_SYMLINK(f));
         } else
  #endif
-        {
--               rprintf(FINFO, "%s %11.0f %s %s\n",
-+               rprintf(FINFO, "%s %11.0f %s%s %s\n",
-                        permbuf, len, timestring(f->modtime),
--                       f_name(f, NULL));
-+                       crtime_buf, f_name(f, NULL));
+        if (missing_args == 2 && f->mode == 0) {
+@@ -1156,9 +1173,12 @@ static void list_file_entry(struct file_struct *f)
+                        colwidth + 31, "*missing",
+                        f_name(f, NULL));
+        } else {
+-               rprintf(FINFO, "%s %*s %s %s\n",
++               rprintf(FINFO, "%s %*s %s%s%s %s\n",
+                        permbuf, colwidth, human_num(len),
+-                       timestring(f->modtime), f_name(f, NULL));
++                       timestring(f->modtime),
++                       crtimes_ndx ? " " : "",
++                       crtimes_ndx ? timestring(crtime) : "",
++                       f_name(f, NULL));
         }
  }
  
-@@ -1383,6 +1403,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1250,6 +1270,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                         return;
                 }
         }
 +       sx.crtime = 0;
  
         if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) {
-          parent_is_dry_missing:
-diff --git a/hlink.c b/hlink.c
---- a/hlink.c
-+++ b/hlink.c
-@@ -371,6 +371,7 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname,
-                char cmpbuf[MAXPATHLEN];
-                stat_x alt_sx;
-                int j = 0;
-+               alt_sx.crtime = 0;
- #ifdef SUPPORT_ACLS
-                alt_sx.acc_acl = alt_sx.def_acl = NULL;
- #endif
-@@ -499,6 +500,7 @@ void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
-        } else
-                our_name = fname;
- 
-+       prev_sx.crtime = 0;
- #ifdef SUPPORT_ACLS
-        prev_sx.acc_acl = prev_sx.def_acl = NULL;
- #endif
+                int i;
 diff --git a/ifuncs.h b/ifuncs.h
 --- a/ifuncs.h
 +++ b/ifuncs.h
-@@ -67,6 +67,28 @@ d_name(struct dirent *di)
- #endif
+@@ -43,6 +43,28 @@ free_xbuf(xbuf *xb)
+        memset(xb, 0, sizeof (xbuf));
  }
  
 +static inline time_t
@@ -300 +265 @@
 +}
 +
  static inline int
- isDigit(const char *ptr)
+ to_wire_mode(mode_t mode)
  {
 diff --git a/log.c b/log.c
 --- a/log.c
 +++ b/log.c
-@@ -661,7 +661,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+@@ -723,7 +723,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                         c[8] = !(iflags & ITEM_REPORT_FFLAGS) ? '.' : 'f';
                         c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
                         c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
@@ -318 +283 @@
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -60,6 +60,7 @@ int preserve_specials = 0;
+@@ -62,6 +62,7 @@ int preserve_specials = 0;
  int preserve_uid = 0;
  int preserve_gid = 0;
  int preserve_times = 0;
@@ -326 +291 @@
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -361,6 +362,7 @@ void usage(enum logcode F)
+@@ -718,6 +719,7 @@ void usage(enum logcode F)
+   rprintf(F,"     --specials              preserve special files\n");
    rprintf(F," -D                          same as --devices --specials\n");
    rprintf(F," -t, --times                 preserve modification times\n");
-   rprintf(F," -O, --omit-dir-times        omit directories from --times\n");
 +  rprintf(F," -N, --crtimes               preserve create times (newness)\n");
+   rprintf(F," -O, --omit-dir-times        omit directories from --times\n");
+   rprintf(F," -J, --omit-link-times       omit symlinks from --times\n");
    rprintf(F,"     --super                 receiver attempts super-user activities\n");
- #ifdef SUPPORT_XATTRS
-   rprintf(F,"     --fake-super            store/recover privileged attrs using xattrs\n");
-@@ -507,6 +509,9 @@ static struct poptOption long_options[] = {
+@@ -885,6 +887,9 @@ static struct poptOption long_options[] = {
    {"times",           't', POPT_ARG_VAL,    &preserve_times, 1, 0, 0 },
    {"no-times",         0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
    {"no-t",             0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
@@ -344 +309 @@
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 1, 0, 0 },
    {"no-omit-dir-times",0,  POPT_ARG_VAL,    &omit_dir_times, 0, 0, 0 },
    {"no-O",             0,  POPT_ARG_VAL,    &omit_dir_times, 0, 0, 0 },
-@@ -1810,6 +1815,8 @@ void server_options(char **args, int *argc_p)
+@@ -2465,6 +2470,8 @@ void server_options(char **args, int *argc_p)
                 argstr[x++] = 'D';
         if (preserve_times)
                 argstr[x++] = 't';
@@ -356 +321 @@
 diff --git a/rsync.c b/rsync.c
 --- a/rsync.c
 +++ b/rsync.c
-@@ -464,6 +464,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
-                                full_fname(fname));
-                        return 0;
-                }
-+               sx2.crtime = 0;
- #ifdef SUPPORT_ACLS
-                sx2.acc_acl = sx2.def_acl = NULL;
- #endif
-@@ -505,6 +506,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -581,6 +581,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
          || (!(preserve_times & PRESERVE_DIR_TIMES) && S_ISDIR(sxp->st.st_mode))
          || (!(preserve_times & PRESERVE_LINK_TIMES) && S_ISLNK(sxp->st.st_mode)))
                 flags |= ATTRS_SKIP_MTIME;
@@ -373 +330 @@
 +               flags |= ATTRS_SKIP_CRTIME;
         if (!(flags & ATTRS_SKIP_MTIME)
             && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
-                int ret = set_modtime(fname, file->modtime, sxp->st.st_mode, ST_FLAGS(sxp->st));
-@@ -518,6 +522,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+                int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode, ST_FLAGS(sxp->st));
+@@ -594,6 +597,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
                 else
                         file->flags |= FLAG_TIME_FAILED;
         }
@@ -387 +344 @@
 +                       updated = 1;
 +       }
  
-        change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
-        change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
-@@ -675,7 +687,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+ #ifdef SUPPORT_ACLS
+        /* It's OK to call set_acl() now, even for a dir, as the generator
+@@ -710,7 +721,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
         /* Change permissions before putting the file into place. */
         set_file_attrs(fnametmp, file, NULL, fnamecmp,
                        ATTRS_DELAY_IMMUTABLE
@@ -397 +354 @@
 +                      | (ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_CRTIME));
  
         /* move tmp file over real file */
-        if (verbose > 2)
-@@ -706,7 +718,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+        if (DEBUG_GTE(RECV, 1))
+@@ -739,7 +750,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
  
    do_set_file_attrs:
         set_file_attrs(fnametmp, file, NULL, fnamecmp,
@@ -410 +367 @@
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -61,6 +61,7 @@
- #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */
+@@ -62,7 +62,8 @@
  #define XMIT_HLINK_FIRST (1<<12)       /* protocols 30 - now (HLINKED files only) */
  #define XMIT_IO_ERROR_ENDLIST (1<<12)  /* protocols 31*- now (w/XMIT_EXTENDED_FLAGS) (also protocol 30 w/'f' compat flag) */
-+#define XMIT_CRTIME_EQ_MTIME (1<<13)   /* protocols ?? - now */
- #define XMIT_SAME_FLAGS (1<<14)                /* protocols ?? - now */
+ #define XMIT_MOD_NSEC (1<<13)          /* protocols 31 - now */
+-#define XMIT_SAME_FLAGS (1<<14)                /* protocols ?? - now */
++#define XMIT_CRTIME_EQ_MTIME (1<<14)   /* protocols ?? - now */
++#define XMIT_SAME_FLAGS (1<<15)                /* protocols ?? - now */
  
  /* These flags are used in the live flist data. */
-@@ -162,6 +163,7 @@
+ 
+@@ -167,6 +168,7 @@
  #define ATTRS_REPORT           (1<<0)
  #define ATTRS_SKIP_MTIME       (1<<1)
  #define ATTRS_DELAY_IMMUTABLE  (1<<2)
@@ -426 +385 @@
  
  #define FULL_FLUSH     1
  #define NORMAL_FLUSH   0
-@@ -178,7 +180,7 @@
+@@ -183,7 +185,7 @@
  #define FNAMECMP_FUZZY         0x83
  
  /* For use by the itemize_changes code */
@@ -435 +394 @@
  #define ITEM_REPORT_CHANGE (1<<1)
  #define ITEM_REPORT_SIZE (1<<2)     /* regular files only */
  #define ITEM_REPORT_TIMEFAIL (1<<2) /* symlinks only */
-@@ -677,6 +679,7 @@ extern int file_extra_cnt;
+@@ -734,6 +736,7 @@ extern int file_extra_cnt;
  extern int inc_recurse;
  extern int uid_ndx;
  extern int gid_ndx;
@@ -443 +402 @@
  extern int fileflags_ndx;
  extern int acls_ndx;
  extern int xattrs_ndx;
-@@ -684,6 +687,7 @@ extern int xattrs_ndx;
+@@ -741,6 +744,7 @@ extern int xattrs_ndx;
  #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
  #define EXTRA_LEN (sizeof (union file_extras))
  #define PTR_EXTRA_CNT ((sizeof (char *) + EXTRA_LEN - 1) / EXTRA_LEN)
@@ -451 +410 @@
  #define DEV_EXTRA_CNT 2
  #define DIRNODE_EXTRA_CNT 3
  #define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN)
-@@ -951,6 +955,7 @@ typedef struct {
+@@ -1022,6 +1026,7 @@ typedef struct {
  
  typedef struct {
      STRUCT_STAT st;
@@ -462 +421 @@
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -367,6 +367,7 @@ to the detailed description below for a complete description.  verb(
+@@ -373,6 +373,7 @@ to the detailed description below for a complete description.  verb(
+      --specials              preserve special files
   -D                          same as --devices --specials
   -t, --times                 preserve modification times
-  -O, --omit-dir-times        omit directories from --times
 + -N, --crtimes               preserve create times (newness)
+  -O, --omit-dir-times        omit directories from --times
+  -J, --omit-link-times       omit symlinks from --times
       --super                 receiver attempts super-user activities
-      --fake-super            store/recover privileged attrs using xattrs
-  -S, --sparse                handle sparse files efficiently
-@@ -1105,6 +1106,9 @@ it is preserving modification times (see bf(--times)).  If NFS is sharing
- the directories on the receiving side, it is a good idea to use bf(-O).
- This option is inferred if you use bf(--backup) without bf(--backup-dir).
+@@ -1201,6 +1202,9 @@ cause the next transfer to behave as if it used bf(-I), causing all files to be
+ updated (though rsync's delta-transfer algorithm will make the update fairly efficient
+ if the files haven't actually changed, you're much better off using bf(-t)).
  
 +dit(bf(-N, --crtimes)) This tells rsync to set the create times (newness) of
 +the destination files to the same value as the source files.
 +
- dit(bf(--super)) This tells the receiving side to attempt super-user
- activities even if the receiving rsync wasn't run by the super-user.  These
- activities include: preserving users via the bf(--owner) option, preserving
-@@ -1811,7 +1815,7 @@ with older versions of rsync, but that also turns on the output of other
+ dit(bf(-O, --omit-dir-times)) This tells rsync to omit directories when
+ it is preserving modification times (see bf(--times)).  If NFS is sharing
+ the directories on the receiving side, it is a good idea to use bf(-O).
+@@ -2103,7 +2107,7 @@ with older versions of rsync, but that also turns on the output of other
  verbose messages).
  
  The "%i" escape has a cryptic output that is 11 letters long.  The general
@@ -489 +448 @@
  type of update being done, bf(X) is replaced by the file-type, and the
  other letters represent attributes that may be output if they are being
  modified.
-@@ -1870,6 +1874,8 @@ quote(itemization(
+@@ -2162,6 +2166,8 @@ quote(itemization(
    it() The bf(f) means that the fileflags information changed.
    it() The bf(a) means that the ACL information changed.
    it() The bf(x) means that the extended attribute information changed.
@@ -501 +460 @@
 diff --git a/syscall.c b/syscall.c
 --- a/syscall.c
 +++ b/syscall.c
-@@ -37,6 +37,13 @@ extern int force_change;
+@@ -42,6 +42,13 @@ extern int force_change;
  extern int preserve_perms;
  extern int preserve_executability;
  
@@ -515 +474 @@
  #define RETURN_ERROR_IF(x,e) \
         do { \
                 if (x) { \
-@@ -529,6 +536,36 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
+@@ -460,6 +467,36 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
  #endif
  }
  
@@ -550 +509 @@
 +}
 +
  #ifdef HAVE_UTIMENSAT
- int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags)
+ int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec)
  {
 diff --git a/testsuite/crtimes.test b/testsuite/crtimes.test
 new file mode 100644
@@ -584 +543 @@
 diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
 --- a/testsuite/rsync.fns
 +++ b/testsuite/rsync.fns
-@@ -24,9 +24,9 @@ todir="$tmpdir/to"
+@@ -23,9 +23,9 @@ todir="$tmpdir/to"
  chkdir="$tmpdir/chk"
  
  # For itemized output:
@@ -600 +559 @@
 diff --git a/tls.c b/tls.c
 --- a/tls.c
 +++ b/tls.c
-@@ -107,6 +107,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)
+@@ -109,6 +109,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)
  
  #endif
  
@@ -609 +568 @@
  static void failed(char const *what, char const *where)
  {
         fprintf(stderr, PROGRAM ": %s %s: %s\n",
-@@ -114,16 +116,36 @@ static void failed(char const *what, char const *where)
+@@ -116,16 +118,44 @@ static void failed(char const *what, char const *where)
         exit(1);
  }
  
-+static void storetime(char *dest, time_t t, size_t destsize)
++static void storetime(char *dest, size_t destsize, time_t t, int nsecs)
 +{
 +       if (t) {
++               int len;
 +               struct tm *mt = gmtime(&t);
 +
-+               snprintf(dest, destsize,
-+                       "%04d-%02d-%02d %02d:%02d:%02d ",
++               len = snprintf(dest, destsize,
++                       "%04d-%02d-%02d %02d:%02d:%02d",
 +                       (int)mt->tm_year + 1900,
 +                       (int)mt->tm_mon + 1,
 +                       (int)mt->tm_mday,
 +                       (int)mt->tm_hour,
 +                       (int)mt->tm_min,
 +                       (int)mt->tm_sec);
-+       } else
-+               strlcpy(dest, "                    ", destsize);
++               if (nsecs >= 0 && len >= 0)
++                       snprintf(dest + len, destsize - len, ".%09d", nsecs);
++       } else {
++               int has_nsecs = nsecs >= 0 ? 1 : 0;
++               int len = MIN(19 + 9*has_nsecs, (int)destsize - 1);
++               memset(dest, ' ', len);
++               dest[len] = '\0';
++       }
 +}
 +
  static void list_file(const char *fname)
@@ -640 +606 @@
 +       char mtimebuf[50];
 +       char crtimebuf[50];
         char linkbuf[4096];
++       int nsecs;
  
         if (do_lstat(fname, &buf) < 0)
                 failed("stat", fname);
@@ -648 +615 @@
  #ifdef SUPPORT_XATTRS
         if (am_root < 0)
                 stat_xattr(fname, &buf);
-@@ -158,19 +180,11 @@ static void list_file(const char *fname)
+@@ -159,30 +189,17 @@ static void list_file(const char *fname)
+        }
  
         permstring(permbuf, buf.st_mode);
- 
+-
 -       if (buf.st_mtime) {
+-               int len;
 -               mt = gmtime(&buf.st_mtime);
 -
--               snprintf(datebuf, sizeof datebuf,
+-               len = snprintf(datebuf, sizeof datebuf,
 -                       "%04d-%02d-%02d %02d:%02d:%02d",
 -                       (int)mt->tm_year + 1900,
 -                       (int)mt->tm_mon + 1,
@@ -663 +632 @@
 -                       (int)mt->tm_hour,
 -                       (int)mt->tm_min,
 -                       (int)mt->tm_sec);
--       } else
--               strlcpy(datebuf, "                   ", sizeof datebuf);
-+       storetime(mtimebuf, buf.st_mtime, sizeof mtimebuf);
+ #ifdef ST_MTIME_NSEC
+-               if (nsec_times) {
+-                       snprintf(datebuf + len, sizeof datebuf - len,
+-                               ".%09d", (int)buf.ST_MTIME_NSEC);
+-               }
++       if (nsec_times)
++               nsecs = (int)buf.ST_MTIME_NSEC;
++       else
+ #endif
+-       } else {
+-               int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1);
+-               memset(datebuf, ' ', len);
+-               datebuf[len] = '\0';
+-       }
++               nsecs = -1;
++       storetime(mtimebuf, sizeof mtimebuf, buf.st_mtime, nsecs);
 +       if (display_crtimes)
-+               storetime(crtimebuf, crtime, sizeof crtimebuf);
++               storetime(crtimebuf, sizeof crtimebuf, crtime, -1);
 +       else
 +               crtimebuf[0] = '\0';
  
         /* TODO: Perhaps escape special characters in fname? */
  
-@@ -181,13 +195,14 @@ static void list_file(const char *fname)
+@@ -193,13 +210,14 @@ static void list_file(const char *fname)
                     (long)minor(buf.st_rdev));
-        } else /* NB: use double for size since it might not fit in a long. */
-                printf("%12.0f", (double)buf.st_size);
+        } else
+                printf("%15s", do_big_num(buf.st_size, 1, NULL));
 -       printf(" %6ld.%-6ld %6ld %s %s%s\n",
 +       printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
                (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
@@ -690 +672 @@
    {"link-times",      'l', POPT_ARG_NONE,   &link_times, 0, 0, 0 },
    {"link-owner",      'L', POPT_ARG_NONE,   &link_owner, 0, 0, 0 },
  #ifdef SUPPORT_XATTRS
-@@ -203,6 +218,7 @@ static void tls_usage(int ret)
+@@ -218,6 +236,7 @@ static void tls_usage(int ret)
    fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
    fprintf(F,"Trivial file listing program for portably checking rsync\n");
    fprintf(F,"\nOptions:\n");
@@ -698 +680 @@
    fprintf(F," -l, --link-times            display the time on a symlink\n");
    fprintf(F," -L, --link-owner            display the owner+group on a symlink\n");
  #ifdef SUPPORT_XATTRS
-diff -up a/proto.h b/proto.h
+diff -Nurp a/proto.h b/proto.h
 --- a/proto.h
 +++ b/proto.h
-@@ -315,6 +315,8 @@ int do_stat(const char *fname, STRUCT_ST
+@@ -327,6 +327,8 @@ int do_stat(const char *fname, STRUCT_ST
  int do_lstat(const char *fname, STRUCT_STAT *st);
  int do_fstat(int fd, STRUCT_STAT *st);
  OFF_T do_lseek(int fd, OFF_T offset, int whence);
 +time_t get_create_time(const char *path);
 +int set_create_time(const char *path, time_t crtime);
- int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags);
- int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags);
- int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags);
-diff -up a/rsync.1 b/rsync.1
+ int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec);
+ int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec);
+ int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec);
+diff -Nurp a/rsync.1 b/rsync.1
 --- a/rsync.1
 +++ b/rsync.1
-@@ -443,6 +443,7 @@ to the detailed description below for a
+@@ -449,6 +449,7 @@ to the detailed description below for a
+      \-\-specials              preserve special files
   \-D                          same as \-\-devices \-\-specials
   \-t, \-\-times                 preserve modification times
-  \-O, \-\-omit\-dir\-times        omit directories from \-\-times
 + \-N, \-\-crtimes               preserve create times (newness)
+  \-O, \-\-omit\-dir\-times        omit directories from \-\-times
+  \-J, \-\-omit\-link\-times       omit symlinks from \-\-times
       \-\-super                 receiver attempts super\-user activities
-      \-\-fake\-super            store/recover privileged attrs using xattrs
-  \-S, \-\-sparse                handle sparse files efficiently
-@@ -1273,6 +1274,10 @@ it is preserving modification times (see
- the directories on the receiving side, it is a good idea to use \fB\-O\fP.
- This option is inferred if you use \fB\-\-backup\fP without \fB\-\-backup\-dir\fP.
+@@ -1379,6 +1380,10 @@ cause the next transfer to behave as if
+ updated (though rsync\(cq\&s delta\-transfer algorithm will make the update fairly efficient
+ if the files haven\(cq\&t actually changed, you\(cq\&re much better off using \fB\-t\fP).
  .IP 
 +.IP "\fB\-N, \-\-crtimes\fP"
 +This tells rsync to set the create times (newness) of
 +the destination files to the same value as the source files.
 +.IP 
- .IP "\fB\-\-super\fP"
- This tells the receiving side to attempt super\-user
- activities even if the receiving rsync wasn\(cq\&t run by the super\-user.  These
-@@ -2067,7 +2072,7 @@ with older versions of rsync, but that a
+ .IP "\fB\-O, \-\-omit\-dir\-times\fP"
+ This tells rsync to omit directories when
+ it is preserving modification times (see \fB\-\-times\fP).  If NFS is sharing
+@@ -2390,7 +2395,7 @@ with older versions of rsync, but that a
  verbose messages).
  .IP 
  The \(dq\&%i\(dq\& escape has a cryptic output that is 11 letters long.  The general
@@ -741 +723 @@
  type of update being done, \fBX\fP is replaced by the file\-type, and the
  other letters represent attributes that may be output if they are being
  modified.
-@@ -2142,6 +2147,9 @@ The \fBf\fP means that the fileflags inf
+@@ -2465,6 +2470,9 @@ The \fBf\fP means that the fileflags inf
  The \fBa\fP means that the ACL information changed.
  .IP o 
  The \fBx\fP means that the extended attribute information changed.

rsync/files/patch-fileflags.diff

@@ -8 +8 @@
     ./configure
     make
 
-based-on: 40afd365cc8ca968fd16e161d24df5b8a8a520cc
+based-on: 7cb0de6326c915a72253fd103dae93308031ec3f
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -42,7 +42,7 @@ popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
+@@ -45,7 +45,7 @@ popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
         popt/popthelp.o popt/poptparse.o
- OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@
+ OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
  
 -TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@
 +TLS_OBJ = tls.o syscall.o t_stub.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@
  
  # Programs we must have to run the test cases
  CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
-@@ -107,7 +107,7 @@ getgroups$(EXEEXT): getgroups.o
+@@ -127,7 +127,7 @@ getgroups$(EXEEXT): getgroups.o
  getfsdev$(EXEEXT): getfsdev.o
         $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS)
  
@@ -33 +33 @@
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
-@@ -43,9 +43,11 @@ extern int checksum_seed;
+@@ -44,9 +44,11 @@ extern int checksum_seed;
  extern int basis_dir_cnt;
  extern int prune_empty_dirs;
  extern int protocol_version;
@@ -45 +45 @@
  extern int preserve_acls;
  extern int preserve_xattrs;
  extern int need_messages_from_generator;
-@@ -63,7 +65,7 @@ extern char *iconv_opt;
+@@ -64,7 +66,7 @@ extern char *iconv_opt;
  #endif
  
  /* These index values are for the file-list's extra-attribute array. */
@@ -54 +54 @@
  
  int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
  int sender_symlink_iconv = 0;  /* sender should convert symlink content */
-@@ -140,6 +142,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -142,6 +144,8 @@ void setup_protocol(int f_out,int f_in)
                 uid_ndx = ++file_extra_cnt;
         if (preserve_gid)
                 gid_ndx = ++file_extra_cnt;
@@ -66 +66 @@
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -569,6 +569,7 @@ AC_FUNC_UTIME_NULL
+@@ -597,6 +597,7 @@ AC_FUNC_UTIME_NULL
  AC_FUNC_ALLOCA
  AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
      fchmod fstat ftruncate strchr readlink link utime utimes lutimes strftime \
@@ -74 +74 @@
      memmove lchown vsnprintf snprintf vasprintf asprintf setsid strpbrk \
      strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
      setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
+diff --git a/delete.c b/delete.c
+--- a/delete.c
++++ b/delete.c
+@@ -25,6 +25,7 @@
+ extern int am_root;
+ extern int make_backups;
+ extern int max_delete;
++extern int force_change;
+ extern char *backup_dir;
+ extern char *backup_suffix;
+ extern int backup_suffix_len;
+@@ -97,8 +98,12 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
+                }
+ 
+                strlcpy(p, fp->basename, remainder);
++#ifdef SUPPORT_FORCE_CHANGE
++               if (force_change)
++                       make_mutable(fname, fp->mode, F_FFLAGS(fp), force_change);
++#endif
+                if (!(fp->mode & S_IWUSR) && !am_root && fp->flags & FLAG_OWNED_BY_US)
+-                       do_chmod(fname, fp->mode | S_IWUSR);
++                       do_chmod(fname, fp->mode | S_IWUSR, NO_FFLAGS);
+                /* Save stack by recursing to ourself directly. */
+                if (S_ISDIR(fp->mode)) {
+                        if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
+@@ -139,11 +144,18 @@ enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
+        }
+ 
+        if (flags & DEL_NO_UID_WRITE)
+-               do_chmod(fbuf, mode | S_IWUSR);
++               do_chmod(fbuf, mode | S_IWUSR, NO_FFLAGS);
+ 
+        if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
+                /* This only happens on the first call to delete_item() since
+                 * delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */
++#ifdef SUPPORT_FORCE_CHANGE
++               if (force_change) {
++                       STRUCT_STAT st;
++                       if (x_lstat(fbuf, &st, NULL) == 0)
++                               make_mutable(fbuf, st.st_mode, st.st_flags, force_change);
++               }
++#endif
+                ignore_perishable = 1;
+                /* If DEL_RECURSE is not set, this just reports emptiness. */
+                ret = delete_dir_contents(fbuf, flags);
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -51,6 +51,7 @@ extern int preserve_links;
+@@ -50,6 +50,7 @@ extern int preserve_links;
  extern int preserve_hard_links;
  extern int preserve_devices;
  extern int preserve_specials;
 +extern int preserve_fileflags;
  extern int delete_during;
+ extern int missing_args;
  extern int eol_nulls;
- extern int relative_paths;
-@@ -394,6 +395,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -399,6 +400,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
  {
         static time_t modtime;
         static mode_t mode;
@@ -95 +140 @@
  #ifdef SUPPORT_HARD_LINKS
         static int64 dev;
  #endif
-@@ -423,6 +427,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -442,6 +446,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
                 xflags |= XMIT_SAME_MODE;
         else
                 mode = file->mode;
@@ -110 +155 @@
  
         if (preserve_devices && IS_DEVICE(mode)) {
                 if (protocol_version < 28) {
-@@ -547,6 +559,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
-        }
+@@ -583,6 +595,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+                write_varint(f, F_MOD_NSEC(file));
         if (!(xflags & XMIT_SAME_MODE))
                 write_int(f, to_wire_mode(mode));
 +#ifdef SUPPORT_FILEFLAGS
@@ -121 +166 @@
         if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
                 if (protocol_version < 30)
                         write_int(f, uid);
-@@ -634,6 +650,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -672,6 +688,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
  {
         static int64 modtime;
         static mode_t mode;
@@ -131 +176 @@
  #ifdef SUPPORT_HARD_LINKS
         static int64 dev;
  #endif
-@@ -731,6 +750,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
-                        file_length = F_LENGTH(first);
+@@ -779,6 +798,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
                         modtime = first->modtime;
+                        modtime_nsec = F_MOD_NSEC(first);
                         mode = first->mode;
 +#ifdef SUPPORT_FILEFLAGS
 +                       if (preserve_fileflags)
@@ -142 +187 @@
                         if (preserve_uid)
                                 uid = F_OWNER(first);
                         if (preserve_gid)
-@@ -768,6 +791,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -820,6 +843,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
  
-        if (chmod_modes && !S_ISLNK(mode))
+        if (chmod_modes && !S_ISLNK(mode) && mode)
                 mode = tweak_mode(mode, chmod_modes);
 +#ifdef SUPPORT_FILEFLAGS
 +       if (preserve_fileflags && !(xflags & XMIT_SAME_FLAGS))
@@ -153 +198 @@
  
         if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
                 if (protocol_version < 30)
-@@ -909,6 +936,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -978,6 +1005,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
         }
  #endif
         file->mode = mode;
 +#ifdef SUPPORT_FILEFLAGS
-+       if (fileflags_ndx) /* check the ndx for force_change w/o preserve_fileflags */
++       if (preserve_fileflags)
 +               F_FFLAGS(file) = fileflags;
 +#endif
         if (preserve_uid)
                 F_OWNER(file) = uid;
         if (preserve_gid) {
-@@ -1283,6 +1314,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1375,6 +1406,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
         }
  #endif
         file->mode = st.st_mode;
@@ -175 +220 @@
         if (preserve_uid)
                 F_OWNER(file) = st.st_uid;
         if (preserve_gid)
-@@ -1429,6 +1464,9 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
- #ifdef SUPPORT_XATTRS
-                if (preserve_xattrs) {
-                        sx.st.st_mode = file->mode;
-+#ifdef SUPPORT_FILEFLAGS
-+                       sx.st.st_flags = preserve_fileflags ? F_FFLAGS(file) : 0;
-+#endif
-                        sx.xattr = NULL;
-                        if (get_xattr(fname, &sx) < 0) {
-                                io_error |= IOERR_GENERAL;
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
-@@ -35,6 +35,7 @@ extern int do_progress;
- extern int relative_paths;
- extern int implied_dirs;
- extern int keep_dirlinks;
-+extern int force_change;
- extern int preserve_acls;
- extern int preserve_xattrs;
- extern int preserve_links;
-@@ -42,6 +43,7 @@ extern int preserve_devices;
+@@ -42,8 +42,10 @@ extern int preserve_devices;
  extern int preserve_specials;
  extern int preserve_hard_links;
  extern int preserve_executability;
 +extern int preserve_fileflags;
  extern int preserve_perms;
  extern int preserve_times;
++extern int force_change;
  extern int delete_mode;
-@@ -164,11 +166,15 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
-        }
- 
-        if (flags & DEL_NO_UID_WRITE)
--               do_chmod(fbuf, mode | S_IWUSR);
-+               do_chmod(fbuf, mode | S_IWUSR, NO_FFLAGS);
- 
-        if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
-                /* This only happens on the first call to delete_item() since
-                 * delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */
-+#ifdef SUPPORT_FORCE_CHANGE
-+               if (force_change)
-+                       make_mutable(fbuf, NULL, NO_FFLAGS, force_change);
-+#endif
-                ignore_perishable = 1;
-                /* If DEL_RECURSE is not set, this just reports emptiness. */
-                ret = delete_dir_contents(fbuf, flags);
-@@ -285,8 +291,14 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
-                }
- 
-                strlcpy(p, fp->basename, remainder);
-+#ifdef SUPPORT_FORCE_CHANGE
-+               if (force_change) {
-+                       mode_t mode = fp->mode;
-+                       make_mutable(fname, &mode, F_FFLAGS(fp), force_change);
-+               }
-+#endif
-                if (!(fp->mode & S_IWUSR) && !am_root && fp->flags & FLAG_OWNED_BY_US)
--                       do_chmod(fname, fp->mode | S_IWUSR);
-+                       do_chmod(fname, fp->mode | S_IWUSR, NO_FFLAGS);
-                /* Save stack by recursing to ourself directly. */
-                if (S_ISDIR(fp->mode)) {
-                        if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
-@@ -647,6 +659,10 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
+ extern int delete_before;
+ extern int delete_during;
+@@ -465,6 +467,10 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
                         return 0;
                 if (perms_differ(file, sxp))
                         return 0;
@@ -248 +245 @@
                 if (ownership_differs(file, sxp))
                         return 0;
  #ifdef SUPPORT_ACLS
-@@ -698,6 +714,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -516,6 +522,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
                 if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
                     && sxp->st.st_gid != (gid_t)F_GROUP(file))
                         iflags |= ITEM_REPORT_GROUP;
@@ -260 +257 @@
  #ifdef SUPPORT_ACLS
                 if (preserve_acls && !S_ISLNK(file->mode)) {
                         if (!ACL_READY(*sxp))
-@@ -1491,6 +1512,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1395,6 +1406,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                         file->mode = dest_mode(file->mode, sx.st.st_mode,
                                                dflt_perms, statret == 0);
                 }
@@ -271 +268 @@
                 if (statret != 0 && basis_dir[0] != NULL) {
                         int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
                                               itemizing, code);
-@@ -1535,10 +1560,17 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1439,10 +1454,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                  * readable and writable permissions during the time we are
                  * putting files within them.  This is then restored to the
                  * former permissions after the transfer is done. */
 +#ifdef SUPPORT_FORCE_CHANGE
-+               if (force_change && F_FFLAGS(file) & force_change) {
-+                       mode_t mode = file->mode;
-+                       if (make_mutable(fname, &mode, F_FFLAGS(file), force_change))
-+                               need_retouch_dir_perms = 1;
-+               }
++               if (force_change && F_FFLAGS(file) & force_change
++                && make_mutable(fname, file->mode, F_FFLAGS(file), force_change))
++                       need_retouch_dir_perms = 1;
 +#endif
  #ifdef HAVE_CHMOD
                 if (!am_root && (file->mode & S_IRWXU) != S_IRWXU && dir_tweaking) {
@@ -290 +285 @@
                                 rsyserr(FERROR_XFER, errno,
                                         "failed to modify permissions on %s",
                                         full_fname(fname));
-@@ -1573,6 +1605,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1477,6 +1497,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                 file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms,
                                        exists);
         }
@@ -301 +296 @@
  
  #ifdef SUPPORT_HARD_LINKS
         if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
-@@ -2116,13 +2152,17 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
+@@ -2045,13 +2069,17 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
                         continue;
                 fname = f_name(file, NULL);
                 if (fix_dir_perms)
@@ -311 +306 @@
                         STRUCT_STAT st;
                         if (link_stat(fname, &st, 0) == 0
                          && cmp_time(st.st_mtime, file->modtime) != 0)
--                               set_modtime(fname, file->modtime, file->mode);
-+                               set_modtime(fname, file->modtime, file->mode, 0);
+-                               set_modtime(fname, file->modtime, F_MOD_NSEC(file), file->mode);
++                               set_modtime(fname, file->modtime, F_MOD_NSEC(file), file->mode, 0);
                 }
 +#ifdef SUPPORT_FORCE_CHANGE
 +               if (force_change && F_FFLAGS(file) & force_change)
@@ -320 +315 @@
 +#endif
                 if (counter >= loopchk_limit) {
                         if (allowed_lull)
-                                maybe_send_keepalive();
+                                maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH);
 diff --git a/log.c b/log.c
 --- a/log.c
 +++ b/log.c
-@@ -658,7 +658,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+@@ -720,7 +720,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                         c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
                         c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
                         c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
@@ -344 +339 @@
 +#include <sys/sysctl.h>
 +#endif
  
- extern int verbose;
  extern int dry_run;
-@@ -51,6 +54,7 @@ extern int protocol_version;
+ extern int list_only;
+@@ -51,6 +54,7 @@ extern int copy_unsafe_links;
+ extern int keep_dirlinks;
+ extern int preserve_hard_links;
+ extern int protocol_version;
++extern int force_change;
  extern int file_total;
  extern int recurse;
  extern int xfer_dirs;
-+extern int force_change;
- extern int protect_args;
- extern int relative_paths;
- extern int sanitize_paths;
-@@ -753,6 +757,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
+@@ -839,6 +843,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
          * points to an identical file won't be replaced by the referent. */
         copy_links = copy_dirlinks = copy_unsafe_links = 0;
  
@@ -380 +375 @@
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -53,6 +53,7 @@ int preserve_hard_links = 0;
+@@ -55,6 +55,7 @@ int preserve_hard_links = 0;
  int preserve_acls = 0;
  int preserve_xattrs = 0;
  int preserve_perms = 0;
@@ -388 +383 @@
  int preserve_executability = 0;
  int preserve_devices = 0;
  int preserve_specials = 0;
-@@ -84,6 +85,7 @@ int implied_dirs = 1;
- int numeric_ids = 0;
+@@ -89,6 +90,7 @@ int numeric_ids = 0;
+ int msgs2stderr = 0;
  int allow_8bit_chars = 0;
  int force_delete = 0;
 +int force_change = 0;
  int io_timeout = 0;
  int prune_empty_dirs = 0;
  int use_qsort = 0;
-@@ -223,6 +225,7 @@ static void print_rsync_version(enum logcode f)
+@@ -574,6 +576,7 @@ static void print_rsync_version(enum logcode f)
         char const *links = "no ";
         char const *iconv = "no ";
         char const *ipv6 = "no ";
@@ -404 +399 @@
         STRUCT_STAT *dumstat;
  
  #if SUBPROTOCOL_VERSION != 0
-@@ -256,6 +259,9 @@ static void print_rsync_version(enum logcode f)
+@@ -610,6 +613,9 @@ static void print_rsync_version(enum logcode f)
  #ifdef CAN_SET_SYMLINK_TIMES
         symtimes = "";
  #endif
@@ -414 +409 @@
  
         rprintf(f, "%s  version %s  protocol version %d%s\n",
                 RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
-@@ -269,8 +275,8 @@ static void print_rsync_version(enum logcode f)
+@@ -623,8 +629,8 @@ static void print_rsync_version(enum logcode f)
                 (int)(sizeof (int64) * 8));
         rprintf(f, "    %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
                 got_socketpair, hardlinks, links, ipv6, have_inplace);
--       rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes\n",
--               have_inplace, acls, xattrs, iconv, symtimes);
-+       rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sfile-flags\n",
-+               have_inplace, acls, xattrs, iconv, symtimes, fileflags);
+-       rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sprealloc\n",
+-               have_inplace, acls, xattrs, iconv, symtimes, prealloc);
++       rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sprealloc, %sfile-flags\n",
++               have_inplace, acls, xattrs, iconv, symtimes, prealloc, fileflags);
  
  #ifdef MAINTAINER_MODE
         rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
-@@ -337,6 +343,9 @@ void usage(enum logcode F)
+@@ -695,6 +701,9 @@ void usage(enum logcode F)
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
    rprintf(F," -H, --hard-links            preserve hard links\n");
    rprintf(F," -p, --perms                 preserve permissions\n");
@@ -435 +430 @@
    rprintf(F," -E, --executability         preserve the file's executability\n");
    rprintf(F,"     --chmod=CHMOD           affect file and/or directory permissions\n");
  #ifdef SUPPORT_ACLS
-@@ -374,7 +383,12 @@ void usage(enum logcode F)
-   rprintf(F,"     --delete-after          receiver deletes after transfer, not during\n");
-   rprintf(F,"     --delete-excluded       also delete excluded files from destination dirs\n");
+@@ -740,7 +749,12 @@ void usage(enum logcode F)
+   rprintf(F,"     --ignore-missing-args   ignore missing source args without error\n");
+   rprintf(F,"     --delete-missing-args   delete missing source args from destination\n");
    rprintf(F,"     --ignore-errors         delete even if there are I/O errors\n");
 -  rprintf(F,"     --force                 force deletion of directories even if not empty\n");
 +  rprintf(F,"     --force-delete          force deletion of directories even if not empty\n");
@@ -449 +444 @@
    rprintf(F,"     --max-delete=NUM        don't delete more than NUM files\n");
    rprintf(F,"     --max-size=SIZE         don't transfer any file larger than SIZE\n");
    rprintf(F,"     --min-size=SIZE         don't transfer any file smaller than SIZE\n");
-@@ -479,6 +493,10 @@ static struct poptOption long_options[] = {
+@@ -857,6 +871,10 @@ static struct poptOption long_options[] = {
    {"perms",           'p', POPT_ARG_VAL,    &preserve_perms, 1, 0, 0 },
    {"no-perms",         0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
    {"no-p",             0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
@@ -460 +455 @@
    {"executability",   'E', POPT_ARG_NONE,   &preserve_executability, 0, 0, 0 },
    {"acls",            'A', POPT_ARG_NONE,   0, 'A', 0, 0 },
    {"no-acls",          0,  POPT_ARG_VAL,    &preserve_acls, 0, 0, 0 },
-@@ -557,6 +575,14 @@ static struct poptOption long_options[] = {
+@@ -943,6 +961,14 @@ static struct poptOption long_options[] = {
    {"remove-source-files",0,POPT_ARG_VAL,    &remove_source_files, 1, 0, 0 },
    {"force",            0,  POPT_ARG_VAL,    &force_delete, 1, 0, 0 },
    {"no-force",         0,  POPT_ARG_VAL,    &force_delete, 0, 0, 0 },
@@ -475 +470 @@
    {"ignore-errors",    0,  POPT_ARG_VAL,    &ignore_errors, 1, 0, 0 },
    {"no-ignore-errors", 0,  POPT_ARG_VAL,    &ignore_errors, 0, 0, 0 },
    {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
-@@ -1879,6 +1905,9 @@ void server_options(char **args, int *argc_p)
+@@ -2537,6 +2563,9 @@ void server_options(char **args, int *argc_p)
         if (xfer_dirs && !recurse && delete_mode && am_sender)
                 args[ac++] = "--no-r";
  
@@ -485 +480 @@
         if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) {
                 if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0)
                         goto oom;
-@@ -1966,6 +1995,16 @@ void server_options(char **args, int *argc_p)
+@@ -2624,6 +2653,16 @@ void server_options(char **args, int *argc_p)
                         args[ac++] = "--delete-excluded";
                 if (force_delete)
                         args[ac++] = "--force";
@@ -505 +500 @@
 diff --git a/rsync.c b/rsync.c
 --- a/rsync.c
 +++ b/rsync.c
-@@ -29,9 +29,11 @@
- 
- extern int verbose;
- extern int dry_run;
-+extern int force_change;
+@@ -31,6 +31,7 @@ extern int dry_run;
  extern int preserve_acls;
  extern int preserve_xattrs;
  extern int preserve_perms;
@@ -517 +508 @@
  extern int preserve_executability;
  extern int preserve_times;
  extern int am_root;
-@@ -374,6 +376,74 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
+@@ -452,6 +453,39 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
         return new_mode;
  }
  
@@ -527 +518 @@
 +{
 +       if (do_chflags(fname, fileflags) != 0) {
 +               rsyserr(FERROR_XFER, errno,
-+                       "failed to set fileflags (%x) on %s",
-+                       fileflags, full_fname(fname));
++                       "failed to set file flags on %s",
++                       full_fname(fname));
 +               return 0;
 +       }
 +
 +       return 1;
 +}
 +
-+/* Remove immutable flags from an object, so it can be altered/removed.
-+ * Returns the fileflags if flags were removed, otherwise 0.  If the
-+ * fileflags value is NO_FFLAGS, we will stat the fname to figure out
-+ * what the flags are, and return the mode via *mode_ptr (if non-NULL). */
-+uint32 make_mutable(const char *fname, mode_t *mode_ptr, uint32 fileflags, uint32 iflags)
++/* Remove immutable flags from an object, so it can be altered/removed. */
++int make_mutable(const char *fname, mode_t mode, uint32 fileflags, uint32 iflags)
 +{
-+       if (fileflags == NO_FFLAGS) {
-+               STRUCT_STAT st;
-+               if (x_lstat(fname, &st, NULL) < 0)
-+                       return 0;
-+               fileflags = st.st_flags;
-+               if (mode_ptr)
-+                       *mode_ptr = st.st_mode;
-+               else
-+                       mode_ptr = &st.st_mode;
-+       }
-+
-+       if ((mode_ptr && S_ISLNK(*mode_ptr)) || !(fileflags & iflags))
++       if (S_ISLNK(mode) || !(fileflags & iflags))
 +               return 0;
-+
 +       if (!set_fileflags(fname, fileflags & ~iflags))
-+               return 0;
-+
-+       return fileflags;
++               return -1;
++       return 1;
 +}
 +
 +/* Undo a prior make_mutable() call that returned a 1. */
 +int undo_make_mutable(const char *fname, uint32 fileflags)
 +{
-+       if (!set_fileflags(fname, fileflags)) {
-+               rsyserr(FINFO, errno, "failed to relock %s", full_fname(fname));
++       if (!set_fileflags(fname, fileflags))
 +               return -1;
-+       }
 +       return 1;
 +}
-+
-+/* This returns the st_flags value if the parent directory was made mutable, otherwise 0.
-+ * It stores the parent directory path into parent_dirbuf. */
-+int make_parentdir_mutable(const char *fname, uint32 iflags, char *parent_dirbuf, int parent_dirbuf_size)
-+{
-+       char *slash = strrchr(fname, '/');
-+
-+       if (slash) {
-+               int len = slash - fname;
-+               if (len >= parent_dirbuf_size)
-+                       return 0;
-+               strlcpy(parent_dirbuf, fname, len+1);
-+       } else
-+               strlcpy(parent_dirbuf, ".", parent_dirbuf_size);
-+
-+       return make_mutable(parent_dirbuf, NULL, NO_FFLAGS, iflags);
-+}
 +#endif
 +
  int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
                    const char *fnamecmp, int flags)
  {
-@@ -382,6 +452,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
-        int change_uid, change_gid;
-        mode_t new_mode = file->mode;
-        int inherit;
-+#ifdef SUPPORT_FORCE_CHANGE
-+       int became_mutable = 0;
-+#endif
- 
-        if (!sxp) {
-                if (dry_run)
-@@ -411,6 +484,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
-        if (daemon_chmod_modes && !S_ISLNK(new_mode))
-                new_mode = tweak_mode(new_mode, daemon_chmod_modes);
- 
-+#ifdef SUPPORT_FORCE_CHANGE
-+       if (force_change)
-+               became_mutable = make_mutable(fname, &sxp->st.st_mode, sxp->st.st_flags, force_change);
-+#endif
-+
- #ifdef SUPPORT_ACLS
-        if (preserve_acls && !S_ISLNK(file->mode) && !ACL_READY(*sxp))
-                get_acl(fname, sxp);
-@@ -429,7 +507,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
-                flags |= ATTRS_SKIP_MTIME;
-        if (!(flags & ATTRS_SKIP_MTIME)
-            && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
--               int ret = set_modtime(fname, file->modtime, sxp->st.st_mode);
-+               int ret = set_modtime(fname, file->modtime, sxp->st.st_mode, ST_FLAGS(sxp->st));
-                if (ret < 0) {
-                        rsyserr(FERROR_XFER, errno, "failed to set times on %s",
-                                full_fname(fname));
-@@ -465,7 +543,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -513,7 +547,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
                 if (am_root >= 0) {
                         uid_t uid = change_uid ? (uid_t)F_OWNER(file) : sxp->st.st_uid;
                         gid_t gid = change_gid ? (gid_t)F_GROUP(file) : sxp->st.st_gid;
@@ -632 +557 @@
                                 /* We shouldn't have attempted to change uid
                                  * or gid unless have the privilege. */
                                 rsyserr(FERROR_XFER, errno, "%s %s failed",
-@@ -503,7 +581,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -549,7 +583,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+                flags |= ATTRS_SKIP_MTIME;
+        if (!(flags & ATTRS_SKIP_MTIME)
+            && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
+-               int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode);
++               int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode, ST_FLAGS(sxp->st));
+                if (ret < 0) {
+                        rsyserr(FERROR_XFER, errno, "failed to set times on %s",
+                                full_fname(fname));
+@@ -576,7 +610,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
  
  #ifdef HAVE_CHMOD
         if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
@@ -641 +575 @@
                 if (ret < 0) {
                         rsyserr(FERROR_XFER, errno,
                                 "failed to set permissions on %s",
-@@ -515,6 +593,24 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -588,6 +622,19 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
         }
  #endif
  
-+#ifdef SUPPORT_FORCE_CHANGE
-+       if (became_mutable)
-+               undo_make_mutable(fname, sxp->st.st_flags);
-+#endif
-+
 +#ifdef SUPPORT_FILEFLAGS
 +       if (preserve_fileflags && !S_ISLNK(sxp->st.st_mode)
 +        && sxp->st.st_flags != F_FFLAGS(file)) {
@@ -663 +592 @@
 +       }
 +#endif
 +
-        if (verbose > 1 && flags & ATTRS_REPORT) {
+        if (INFO_GTE(NAME, 2) && flags & ATTRS_REPORT) {
                 if (updated)
                         rprintf(FCLIENT, "%s\n", fname);
-@@ -578,7 +674,8 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -662,7 +709,8 @@ int finish_transfer(const char *fname, const char *fnametmp,
  
         /* Change permissions before putting the file into place. */
         set_file_attrs(fnametmp, file, NULL, fnamecmp,
@@ -675 +604 @@
 +                      | (ok_to_set_time ? 0 : ATTRS_SKIP_MTIME));
  
         /* move tmp file over real file */
-        if (verbose > 2)
-@@ -597,6 +694,10 @@ int finish_transfer(const char *fname, const char *fnametmp,
+        if (DEBUG_GTE(RECV, 1))
+@@ -679,6 +727,10 @@ int finish_transfer(const char *fname, const char *fnametmp,
         }
         if (ret == 0) {
                 /* The file was moved into place (not copied), so it's done. */
@@ -690 +619 @@
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -61,6 +61,7 @@
- #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */
+@@ -62,6 +62,7 @@
  #define XMIT_HLINK_FIRST (1<<12)       /* protocols 30 - now (HLINKED files only) */
  #define XMIT_IO_ERROR_ENDLIST (1<<12)  /* protocols 31*- now (w/XMIT_EXTENDED_FLAGS) (also protocol 30 w/'f' compat flag) */
+ #define XMIT_MOD_NSEC (1<<13)          /* protocols 31 - now */
 +#define XMIT_SAME_FLAGS (1<<14)                /* protocols ?? - now */
  
  /* These flags are used in the live flist data. */
  
-@@ -160,6 +161,7 @@
+@@ -165,6 +166,7 @@
  
  #define ATTRS_REPORT           (1<<0)
  #define ATTRS_SKIP_MTIME       (1<<1)
@@ -706 +635 @@
  
  #define FULL_FLUSH     1
  #define NORMAL_FLUSH   0
-@@ -186,6 +188,7 @@
+@@ -191,6 +193,7 @@
  #define ITEM_REPORT_GROUP (1<<6)
  #define ITEM_REPORT_ACL (1<<7)
  #define ITEM_REPORT_XATTR (1<<8)
@@ -714 +643 @@
  #define ITEM_BASIS_TYPE_FOLLOWS (1<<11)
  #define ITEM_XNAME_FOLLOWS (1<<12)
  #define ITEM_IS_NEW (1<<13)
-@@ -482,6 +485,28 @@ typedef unsigned int size_t;
+@@ -522,6 +525,28 @@ typedef unsigned int size_t;
  #endif
  #endif
  
@@ -743 +672 @@
  /* Find a variable that is either exactly 32-bits or longer.
   * If some code depends on 32-bit truncation, it will need to
   * take special action in a "#if SIZEOF_INT32 > 4" section. */
-@@ -652,6 +677,7 @@ extern int file_extra_cnt;
+@@ -709,6 +734,7 @@ extern int file_extra_cnt;
  extern int inc_recurse;
  extern int uid_ndx;
  extern int gid_ndx;
@@ -751 +680 @@
  extern int acls_ndx;
  extern int xattrs_ndx;
  
-@@ -689,6 +715,11 @@ extern int xattrs_ndx;
+@@ -750,6 +776,11 @@ extern int xattrs_ndx;
  /* When the associated option is on, all entries will have these present: */
  #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
  #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum
@@ -766 +695 @@
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -355,6 +355,7 @@ to the detailed description below for a complete description.  verb(
+@@ -362,6 +362,7 @@ to the detailed description below for a complete description.  verb(
   -K, --keep-dirlinks         treat symlinked dir on receiver as dir
   -H, --hard-links            preserve hard links
   -p, --perms                 preserve permissions
@@ -774 +703 @@
   -E, --executability         preserve executability
       --chmod=CHMOD           affect file and/or directory permissions
   -A, --acls                  preserve ACLs (implies -p)
-@@ -386,7 +387,10 @@ to the detailed description below for a complete description.  verb(
-      --delete-after          receiver deletes after transfer, not during
-      --delete-excluded       also delete excluded files from dest dirs
+@@ -397,7 +398,10 @@ to the detailed description below for a complete description.  verb(
+      --ignore-missing-args   ignore missing source args without error
+      --delete-missing-args   delete missing source args from destination
       --ignore-errors         delete even if there are I/O errors
 -     --force                 force deletion of dirs even if not empty
 +     --force-delete          force deletion of dirs even if not empty
@@ -786 +715 @@
       --max-delete=NUM        don't delete more than NUM files
       --max-size=SIZE         don't transfer any file larger than SIZE
       --min-size=SIZE         don't transfer any file smaller than SIZE
-@@ -566,7 +570,8 @@ specified, in which case bf(-r) is not implied.
+@@ -644,7 +648,8 @@ specified, in which case bf(-r) is not implied.
  
  Note that bf(-a) bf(does not preserve hardlinks), because
  finding multiply-linked files is expensive.  You must separately
@@ -796 +725 @@
  
  dit(--no-OPTION) You may turn off one or more implied options by prefixing
  the option name with "no-".  Not all options may be prefixed with a "no-":
-@@ -846,7 +851,7 @@ they would be using bf(--copy-links).
+@@ -943,7 +948,7 @@ they would be using bf(--copy-links).
  Without this option, if the sending side has replaced a directory with a
  symlink to a directory, the receiving side will delete anything that is in
  the way of the new symlink, including a directory hierarchy (as long as
@@ -805 +734 @@
  
  See also bf(--keep-dirlinks) for an analogous option for the receiving
  side.
-@@ -1009,6 +1014,29 @@ Note that this option does not copy rsyncs special xattr values (e.g. those
+@@ -1106,6 +1111,29 @@ Note that this option does not copy rsyncs special xattr values (e.g. those
  used by bf(--fake-super)) unless you repeat the option (e.g. -XX).  This
  "copy all xattrs" mode cannot be used with bf(--fake-super).
  
@@ -830 +759 @@
 +dit(bf(--force-schange)) This option causes rsync to disable system-immutable
 +flags on files and directories that are being updated or deleted on the
 +receiving side.  It does not try to affect user flags.  This option overrides
-+bf(--force-change) and bf(--force-schange).
++bf(--force-change) and bf(--force-uchange).
 +
  dit(bf(--chmod)) This option tells rsync to apply one or more
  comma-separated "chmod" modes to the permission of the files in the
  transfer.  The resulting value is treated as though it were the permissions
-@@ -1289,12 +1317,13 @@ See bf(--delete) (which is implied) for more details on file-deletion.
+@@ -1435,12 +1463,13 @@ display as a "*missing" entry in the bf(--list-only) output.
  dit(bf(--ignore-errors)) Tells bf(--delete) to go ahead and delete files
  even when there are I/O errors.
  
@@ -852 +781 @@
  bf(--recursive) option was also enabled.
  
  dit(bf(--max-delete=NUM)) This tells rsync not to delete more than NUM
-@@ -1782,7 +1811,7 @@ with older versions of rsync, but that also turns on the output of other
+@@ -2074,7 +2103,7 @@ with older versions of rsync, but that also turns on the output of other
  verbose messages).
  
  The "%i" escape has a cryptic output that is 11 letters long.  The general
@@ -861 +790 @@
  type of update being done, bf(X) is replaced by the file-type, and the
  other letters represent attributes that may be output if they are being
  modified.
-@@ -1838,7 +1867,7 @@ quote(itemization(
+@@ -2130,7 +2159,7 @@ quote(itemization(
    sender's value (requires bf(--owner) and super-user privileges).
    it() A bf(g) means the group is different and is being updated to the
    sender's value (requires bf(--group) and the authority to set the group).
@@ -873 +802 @@
 diff --git a/syscall.c b/syscall.c
 --- a/syscall.c
 +++ b/syscall.c
-@@ -33,6 +33,7 @@ extern int dry_run;
- extern int am_root;
+@@ -38,6 +38,7 @@ extern int am_root;
+ extern int am_sender;
  extern int read_only;
  extern int list_only;
 +extern int force_change;
  extern int preserve_perms;
  extern int preserve_executability;
  
-@@ -50,14 +51,56 @@ int do_unlink(const char *fname)
+@@ -55,7 +56,23 @@ int do_unlink(const char *fname)
  {
         if (dry_run) return 0;
         RETURN_ERROR_IF_RO_OR_LO;
 -       return unlink(fname);
 +       if (unlink(fname) == 0)
 +               return 0;
-+
 +#ifdef SUPPORT_FORCE_CHANGE
-+       if (force_change && (errno == EPERM || errno == EACCES)) {
-+               char parent[MAXPATHLEN];
-+               int parent_flags;
-+               int saved_errno = errno;
-+               int file_flags = make_mutable(fname, NULL, NO_FFLAGS, force_change);
-+               if (file_flags && unlink(fname) == 0)
-+                       return 0;
-+               parent_flags = make_parentdir_mutable(fname, force_change, parent, sizeof parent);
-+               if (parent_flags) {
-+                       int ret = unlink(fname);
-+                       undo_make_mutable(parent, parent_flags);
-+                       if (ret == 0)
-+                               return 0;
-+               }
-+               if (file_flags)
-+                       undo_make_mutable(fname, file_flags);
-+               errno = saved_errno;
-+       }
-+#endif
-+
-+       return -1;
- }
- 
- int do_symlink(const char *fname1, const char *fname2)
- {
-        if (dry_run) return 0;
-        RETURN_ERROR_IF_RO_OR_LO;
--       return symlink(fname1, fname2);
-+       if (symlink(fname1, fname2) == 0)
-+               return 0;
++       if (force_change && errno == EPERM) {
++               STRUCT_STAT st;
 +
-+#ifdef SUPPORT_FORCE_CHANGE
-+       if (force_change && (errno == EPERM || errno == EACCES)) {
-+               char parent[MAXPATHLEN];
-+               int saved_errno = errno;
-+               int parent_flags = make_parentdir_mutable(fname2, force_change, parent, sizeof parent);
-+               if (parent_flags) {
-+                       int ret = symlink(fname1, fname2);
-+                       undo_make_mutable(parent, parent_flags);
-+                       if (ret == 0)
++               if (x_lstat(fname, &st, NULL) == 0
++                && make_mutable(fname, st.st_mode, st.st_flags, force_change) > 0) {
++                       if (unlink(fname) == 0)
 +                               return 0;
++                       undo_make_mutable(fname, st.st_flags);
 +               }
-+               errno = saved_errno;
++               /* TODO: handle immutable directories */
++               errno = EPERM;
 +       }
 +#endif
-+
 +       return -1;
  }
  
- #ifdef HAVE_LINK
-@@ -65,18 +108,55 @@ int do_link(const char *fname1, const char *fname2)
- {
-        if (dry_run) return 0;
-        RETURN_ERROR_IF_RO_OR_LO;
--       return link(fname1, fname2);
-+       if (link(fname1, fname2) == 0)
-+               return 0;
-+
-+#ifdef SUPPORT_FORCE_CHANGE
-+       if (force_change && (errno == EPERM || errno == EACCES)) {
-+               char parent[MAXPATHLEN];
-+               int saved_errno = errno;
-+               int parent_flags = make_parentdir_mutable(fname2, force_change, parent, sizeof parent);
-+               if (parent_flags) {
-+                       int ret = link(fname1, fname2);
-+                       undo_make_mutable(parent, parent_flags);
-+                       if (ret == 0)
-+                               return 0;
-+               }
-+               errno = saved_errno;
-+       }
-+#endif
-+
-+       return -1;
+ #ifdef SUPPORT_LINKS
+@@ -116,14 +133,37 @@ int do_link(const char *fname1, const char *fname2)
  }
  #endif
  
@@ -978 +850 @@
 -       return lchown(path, owner, group);
 +       if (lchown(path, owner, group) == 0)
 +               return 0;
-+
 +#ifdef SUPPORT_FORCE_CHANGE
-+       if (force_change && (errno == EPERM || errno == EACCES)) {
-+               int saved_errno = errno;
-+               fileflags = make_mutable(path, &mode, fileflags, force_change);
-+               if (fileflags) {
++       if (force_change && errno == EPERM) {
++               if (fileflags == NO_FFLAGS) {
++                       STRUCT_STAT st;
++                       if (x_lstat(path, &st, NULL) == 0) {
++                               mode = st.st_mode;
++                               fileflags = st.st_flags;
++                       }
++               }
++               if (fileflags != NO_FFLAGS
++                && make_mutable(path, mode, fileflags, force_change) > 0) {
 +                       int ret = lchown(path, owner, group);
 +                       undo_make_mutable(path, fileflags);
 +                       if (ret == 0)
 +                               return 0;
 +               }
-+               errno = saved_errno;
++               errno = EPERM;
 +       }
 +#else
 +       mode = fileflags = 0; /* avoid compiler warning */
 +#endif
-+
 +       return -1;
  }
  
  int do_mknod(const char *pathname, mode_t mode, dev_t dev)
-@@ -116,7 +196,7 @@ int do_mknod(const char *pathname, mode_t mode, dev_t dev)
+@@ -163,7 +203,7 @@ int do_mknod(const char *pathname, mode_t mode, dev_t dev)
                         return -1;
                 close(sock);
  #ifdef HAVE_CHMOD
@@ -1008 +884 @@
  #else
                 return 0;
  #endif
-@@ -133,21 +213,63 @@ int do_rmdir(const char *pathname)
+@@ -180,7 +220,22 @@ int do_rmdir(const char *pathname)
  {
         if (dry_run) return 0;
         RETURN_ERROR_IF_RO_OR_LO;
 -       return rmdir(pathname);
 +       if (rmdir(pathname) == 0)
 +               return 0;
-+
 +#ifdef SUPPORT_FORCE_CHANGE
-+       if (force_change && (errno == EPERM || errno == EACCES)) {
-+               char parent[MAXPATHLEN];
-+               int parent_flags;
-+               int saved_errno = errno;
-+               int file_flags = make_mutable(pathname, NULL, NO_FFLAGS, force_change);
-+               if (file_flags && rmdir(pathname) == 0)
-+                       return 0;
-+               parent_flags = make_parentdir_mutable(pathname, force_change, parent, sizeof parent);
-+               if (parent_flags) {
-+                       int ret = rmdir(pathname);
-+                       undo_make_mutable(parent, parent_flags);
-+                       if (ret == 0)
++       if (force_change && errno == EPERM) {
++               STRUCT_STAT st;
++
++               if (x_lstat(pathname, &st, NULL) == 0
++                && make_mutable(pathname, st.st_mode, st.st_flags, force_change) > 0) {
++                       if (rmdir(pathname) == 0)
 +                               return 0;
++                       undo_make_mutable(pathname, st.st_flags);
 +               }
-+               if (file_flags)
-+                       undo_make_mutable(pathname, file_flags);
-+               errno = saved_errno;
++               errno = EPERM;
 +       }
 +#endif
-+
 +       return -1;
  }
  
  int do_open(const char *pathname, int flags, mode_t mode)
- {
-+       int fd;
-        if (flags != O_RDONLY) {
-                RETURN_ERROR_IF(dry_run, 0);
-                RETURN_ERROR_IF_RO_OR_LO;
-        }
-+       if ((fd = open(pathname, flags | O_BINARY, mode)) >= 0)
-+               return fd;
-+
-+#ifdef SUPPORT_FORCE_CHANGE
-+       if (force_change && (errno == EPERM || errno == EACCES)) {
-+               char parent[MAXPATHLEN];
-+               int saved_errno = errno;
-+               int parent_flags = make_parentdir_mutable(pathname, force_change, parent, sizeof parent);
-+               if (parent_flags) {
-+                       fd = open(pathname, flags | O_BINARY, mode);
-+                       undo_make_mutable(parent, parent_flags);
-+                       if (fd >= 0)
-+                               return fd;
-+               }
-+               errno = saved_errno;
-+       }
-+#endif
- 
--       return open(pathname, flags | O_BINARY, mode);
-+       return -1;
+@@ -194,7 +249,7 @@ int do_open(const char *pathname, int flags, mode_t mode)
  }
  
  #ifdef HAVE_CHMOD
@@ -1075 +917 @@
  {
         int code;
         if (dry_run) return 0;
-@@ -170,17 +292,93 @@ int do_chmod(const char *path, mode_t mode)
+@@ -217,17 +272,74 @@ int do_chmod(const char *path, mode_t mode)
         } else
                 code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
  #endif /* !HAVE_LCHMOD */
 +#ifdef SUPPORT_FORCE_CHANGE
-+       if (code < 0 && force_change && (errno == EPERM || errno == EACCES) && !S_ISLNK(mode)) {
-+               int saved_errno = errno;
-+               fileflags = make_mutable(path, &mode, fileflags, force_change);
-+               if (fileflags) {
-+#ifdef HAVE_LCHMOD
-+                       code = lchmod(path, mode & CHMOD_BITS);
-+#else
++       if (code < 0 && force_change && errno == EPERM && !S_ISLNK(mode)) {
++               if (fileflags == NO_FFLAGS) {
++                       STRUCT_STAT st;
++                       if (x_lstat(path, &st, NULL) == 0)
++                               fileflags = st.st_flags;
++               }
++               if (fileflags != NO_FFLAGS
++                && make_mutable(path, mode, fileflags, force_change) > 0) {
 +                       code = chmod(path, mode & CHMOD_BITS);
-+#endif
 +                       undo_make_mutable(path, fileflags);
 +                       if (code == 0)
 +                               return 0;
 +               }
-+               errno = saved_errno;
++               errno = EPERM;
 +       }
 +#else
 +       fileflags = 0; /* avoid compiler warning */
@@ -1120 +962 @@
 -       return rename(fname1, fname2);
 +       if (rename(fname1, fname2) == 0)
 +               return 0;
-+
 +#ifdef SUPPORT_FORCE_CHANGE
-+       if (force_change && (errno == EPERM || errno == EACCES)) {
-+               int saved_errno = errno;
-+               int ret = -1, file2_flags = 0;
-+               int file1_flags = make_mutable(fname1, NULL, NO_FFLAGS, force_change);
-+               if (file1_flags && rename(fname1, fname2) == 0)
-+                       ret = 0;
-+               else {
-+                       file2_flags = make_mutable(fname2, NULL, NO_FFLAGS, force_change);
-+                       if (file2_flags && rename(fname1, fname2) == 0)
-+                               ret = 0;
-+                       else {
-+                               char parent1[MAXPATHLEN];
-+                               int parent1_flags = make_parentdir_mutable(fname1, force_change,
-+                                                       parent1, sizeof parent1);
-+                               if (parent1_flags && rename(fname1, fname2) == 0)
-+                                       ret = 0;
-+                               else {
-+                                       char parent2[MAXPATHLEN];
-+                                       int parent2_flags = make_parentdir_mutable(fname2, force_change,
-+                                                               parent2, sizeof parent2);
-+                                       if (parent2_flags) {
-+                                               if (rename(fname1, fname2) == 0)
-+                                                       ret = 0;
-+                                               undo_make_mutable(parent2, parent2_flags);
-+                                       }
-+                               }
-+                               if (parent1_flags)
-+                                       undo_make_mutable(parent1, parent1_flags);
-+                       }
-+               }
-+
-+               if (ret == 0)
-+                       file2_flags = file1_flags; /* file1 is now file2 */
-+               else if (file1_flags)
-+                       undo_make_mutable(fname1, file1_flags);
-+               if (file2_flags)
-+                       undo_make_mutable(fname2, file2_flags);
-+               if (ret == 0)
-+                       return 0;
-+
-+               errno = saved_errno;
-+       }
-+#endif
++       if (force_change && errno == EPERM) {
++               STRUCT_STAT st1, st2;
++               int became_mutable;
 +
-+       return -1;
- }
- 
- #ifdef HAVE_FTRUNCATE
-@@ -222,7 +420,25 @@ int do_mkdir(char *fname, mode_t mode)
-        if (dry_run) return 0;
-        RETURN_ERROR_IF_RO_OR_LO;
-        trim_trailing_slashes(fname);
--       return mkdir(fname, mode);
-+       if (mkdir(fname, mode) == 0)
-+               return 0;
-+
-+#ifdef SUPPORT_FORCE_CHANGE
-+       if (force_change && (errno == EPERM || errno == EACCES)) {
-+               char parent[MAXPATHLEN];
-+               int saved_errno = errno;
-+               int parent_flags = make_parentdir_mutable(fname, force_change, parent, sizeof parent);
-+               if (parent_flags) {
-+                       int ret = mkdir(fname, mode);
-+                       undo_make_mutable(parent, parent_flags);
-+                       if (ret == 0)
++               if (x_lstat(fname1, &st1, NULL) != 0)
++                       goto failed;
++               became_mutable = make_mutable(fname1, st1.st_mode, st1.st_flags, force_change) > 0;
++               if (became_mutable && rename(fname1, fname2) == 0)
++                       goto success;
++               if (x_lstat(fname2, &st2, NULL) == 0
++                && make_mutable(fname2, st2.st_mode, st2.st_flags, force_change) > 0) {
++                       if (rename(fname1, fname2) == 0) {
++                         success:
++                               if (became_mutable) /* Yes, use fname2 and st1! */
++                                       undo_make_mutable(fname2, st1.st_flags);
 +                               return 0;
-+               }
-+               errno = saved_errno;
-+       }
-+#endif
-+
-+       return -1;
- }
- 
- /* like mkstemp but forces permissions */
-@@ -235,7 +451,19 @@ int do_mkstemp(char *template, mode_t perms)
- #if defined HAVE_SECURE_MKSTEMP && defined HAVE_FCHMOD && (!defined HAVE_OPEN64 || defined HAVE_MKSTEMP64)
-        {
-                int fd = mkstemp(template);
--               if (fd == -1)
-+#ifdef SUPPORT_FORCE_CHANGE
-+               if (fd < 0 && force_change) {
-+                       char parent[MAXPATHLEN];
-+                       int saved_errno = errno;
-+                       int parent_flags = make_parentdir_mutable(template, force_change, parent, sizeof parent);
-+                       if (parent_flags) {
-+                               fd = mkstemp(template);
-+                               undo_make_mutable(parent, parent_flags);
 +                       }
-+                       errno = saved_errno;
++                       undo_make_mutable(fname2, st2.st_flags);
 +               }
-+#endif
-+               if (fd < 0)
-                        return -1;
-                if (fchmod(fd, perms) != 0 && preserve_perms) {
-                        int errno_save = errno;
-@@ -302,7 +530,7 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
- }
- 
- #ifdef HAVE_UTIMENSAT
--int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec)
-+int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags)
- {
-        struct timespec t[2];
- 
-@@ -313,12 +541,26 @@ int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec)
-        t[0].tv_nsec = UTIME_NOW;
-        t[1].tv_sec = modtime;
-        t[1].tv_nsec = mod_nsec;
--       return utimensat(AT_FDCWD, fname, t, AT_SYMLINK_NOFOLLOW);
-+       if (utimensat(AT_FDCWD, fname, t, AT_SYMLINK_NOFOLLOW) == 0)
-+               return 0;
-+
-+#ifdef SUPPORT_FORCE_CHANGE
-+       fileflags = make_mutable(fname, &mode, fileflags, force_change);
-+       if (fileflags) {
-+               if (utimensat(AT_FDCWD, fname, t, AT_SYMLINK_NOFOLLOW) == 0)
-+                       return 0;
-+               undo_make_mutable(fname, fileflags);
-+       }
-+#else
-+       mode = fileflags; /* avoid compiler warning */
-+#endif
-+
-+       return -1;
- }
- #endif
- 
- #ifdef HAVE_LUTIMES
--int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec)
-+int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags)
- {
-        struct timeval t[2];
- 
-@@ -329,12 +571,26 @@ int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec)
-        t[0].tv_usec = 0;
-        t[1].tv_sec = modtime;
-        t[1].tv_usec = mod_nsec / 1000;
--       return lutimes(fname, t);
-+       if (lutimes(fname, t) == 0)
-+               return 0;
-+
-+#ifdef SUPPORT_FORCE_CHANGE
-+       fileflags = make_mutable(fname, &mode, fileflags, force_change);
-+       if (fileflags) {
-+               if (lutimes(fname, t) == 0)
-+                       return 0;
-+               undo_make_mutable(fname, fileflags);
-+       }
-+#else
-+       mode = fileflags; /* avoid compiler warning */
-+#endif
-+
-+       return -1;
- }
- #endif
- 
- #ifdef HAVE_UTIMES
--int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec)
-+int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags)
- {
-        struct timeval t[2];
- 
-@@ -345,14 +601,28 @@ int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec)
-        t[0].tv_usec = 0;
-        t[1].tv_sec = modtime;
-        t[1].tv_usec = mod_nsec / 1000;
--       return utimes(fname, t);
-+       if (utimes(fname, t) == 0)
-+               return 0;
-+
-+#ifdef SUPPORT_FORCE_CHANGE
-+       fileflags = make_mutable(fname, &mode, fileflags, force_change);
-+       if (fileflags) {
-+               if (utimes(fname, t) == 0)
-+                       return 0;
-+               undo_make_mutable(fname, fileflags);
++               /* TODO: handle immutable directories */
++               if (became_mutable)
++                       undo_make_mutable(fname1, st1.st_flags);
++         failed:
++               errno = EPERM;
 +       }
-+#else
-+       mode = fileflags; /* avoid compiler warning */
 +#endif
-+
 +       return -1;
  }
  
- #elif defined HAVE_UTIME
--int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec))
-+int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec), mode_t mode, uint32 fileflags)
- {
- #ifdef HAVE_STRUCT_UTIMBUF
--       struct utimbuf tbuf;
-+       struct utimbuf tbuf, *t = &tbuf;
- #else
-        time_t t[2];
- #endif
-@@ -360,15 +630,28 @@ int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec))
-        if (dry_run) return 0;
-        RETURN_ERROR_IF_RO_OR_LO;
- 
--# ifdef HAVE_STRUCT_UTIMBUF
-+#ifdef HAVE_STRUCT_UTIMBUF
-        tbuf.actime = time(NULL);
-        tbuf.modtime = modtime;
--       return utime(fname, &tbuf);
--# else
-+#else
-        t[0] = time(NULL);
-        t[1] = modtime;
--       return utime(fname, t);
--# endif
-+#endif
-+       if (utime(fname, t) == 0)
-+               return 0;
-+
-+#ifdef SUPPORT_FORCE_CHANGE
-+       fileflags = make_mutable(fname, &mode, fileflags, force_change);
-+       if (fileflags) {
-+               if (utime(fname, t) == 0)
-+                       return 0;
-+               undo_make_mutable(fname, fileflags);
-+       }
-+#else
-+       mode = fileflags; /* avoid compiler warning */
-+#endif
-+
-+       return -1;
- }
- 
- #else
+ #ifdef HAVE_FTRUNCATE
 diff --git a/t_stub.c b/t_stub.c
 --- a/t_stub.c
 +++ b/t_stub.c
-@@ -26,6 +26,7 @@ int module_id = -1;
+@@ -28,6 +28,7 @@ int module_id = -1;
+ int checksum_len = 0;
  int relative_paths = 0;
- int human_readable = 0;
  int module_dirlen = 0;
 +int force_change = 0;
+ int preserve_acls = 0;
  int preserve_times = 0;
  int preserve_xattrs = 0;
- mode_t orig_umask = 002;
-@@ -90,3 +91,27 @@ struct filter_list_struct daemon_filter_list;
+@@ -97,3 +98,23 @@ filter_rule_list daemon_filter_list;
  {
         return "tester";
  }
 +
 +#if defined SUPPORT_FILEFLAGS || defined SUPPORT_FORCE_CHANGE
-+ uint32 make_mutable(UNUSED(const char *fname), UNUSED(mode_t *mode), UNUSED(uint32 fileflags), UNUSED(uint32 iflags))
++ int make_mutable(UNUSED(const char *fname), UNUSED(mode_t mode), UNUSED(uint32 fileflags), UNUSED(uint32 iflags))
 +{
 +       return 0;
 +}
 +
++/* Undo a prior make_mutable() call that returned a 1. */
 + int undo_make_mutable(UNUSED(const char *fname), UNUSED(uint32 fileflags))
 +{
 +       return 0;
 +}
-+
-+ int make_parentdir_mutable(UNUSED(const char *fname), UNUSED(uint32 iflags), UNUSED(char *parent_dirbuf), UNUSED(int parent_dirbuf_size))
-+{
-+       return 0;
-+}
 +#endif
 +
 +#ifdef SUPPORT_XATTRS
@@ -1393 +1031 @@
 diff --git a/util.c b/util.c
 --- a/util.c
 +++ b/util.c
-@@ -125,7 +125,7 @@ NORETURN void overflow_exit(const char *str)
+@@ -33,6 +33,7 @@ extern int relative_paths;
+ extern int preserve_times;
+ extern int preserve_xattrs;
+ extern int preallocate_files;
++extern int force_change;
+ extern char *module_dir;
+ extern unsigned int module_dirlen;
+ extern char *partial_dir;
+@@ -115,9 +116,36 @@ void print_child_argv(const char *prefix, char **cmd)
+        rprintf(FCLIENT, " (%d args)\n", cnt);
+ }
  
++#ifdef SUPPORT_FORCE_CHANGE
++static int try_a_force_change(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags)
++{
++       if (fileflags == NO_FFLAGS) {
++               STRUCT_STAT st;
++               if (x_lstat(fname, &st, NULL) == 0)
++                       fileflags = st.st_flags;
++       }
++
++       if (fileflags != NO_FFLAGS && make_mutable(fname, mode, fileflags, force_change) > 0) {
++               int ret, save_force_change = force_change;
++
++               force_change = 0; /* Make certain we can't come back here. */
++               ret = set_modtime(fname, modtime, mod_nsec, mode, fileflags);
++               force_change = save_force_change;
++
++               undo_make_mutable(fname, fileflags);
++
++               return ret;
++       }
++
++       errno = EPERM;
++
++       return -1;
++}
++#endif
++
  /* This returns 0 for success, 1 for a symlink if symlink time-setting
   * is not possible, or -1 for any other error. */
--int set_modtime(const char *fname, time_t modtime, mode_t mode)
-+int set_modtime(const char *fname, time_t modtime, mode_t mode, uint32 fileflags)
+-int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
++int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags)
  {
         static int switch_step = 0;
  
-@@ -138,7 +138,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
-        switch (switch_step) {
- #ifdef HAVE_UTIMENSAT
+@@ -132,6 +160,11 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
  #include "case_N.h"
--               if (do_utimensat(fname, modtime, 0) == 0)
-+               if (do_utimensat(fname, modtime, 0, mode, fileflags) == 0)
+                if (do_utimensat(fname, modtime, mod_nsec) == 0)
                         break;
++#ifdef SUPPORT_FORCE_CHANGE
++               if (force_change && errno == EPERM
++                && try_a_force_change(fname, modtime, mod_nsec, mode, fileflags) == 0)
++                       break;
++#endif
                 if (errno != ENOSYS)
                         return -1;
-@@ -148,7 +148,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
- 
- #ifdef HAVE_LUTIMES
+                switch_step++;
+@@ -142,6 +175,11 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
  #include "case_N.h"
--               if (do_lutimes(fname, modtime, 0) == 0)
-+               if (do_lutimes(fname, modtime, 0, mode, fileflags) == 0)
+                if (do_lutimes(fname, modtime, mod_nsec) == 0)
                         break;
++#ifdef SUPPORT_FORCE_CHANGE
++               if (force_change && errno == EPERM
++                && try_a_force_change(fname, modtime, mod_nsec, mode, fileflags) == 0)
++                       break;
++#endif
                 if (errno != ENOSYS)
                         return -1;
-@@ -167,10 +167,10 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
- 
- #include "case_N.h"
- #ifdef HAVE_UTIMES
--               if (do_utimes(fname, modtime, 0) == 0)
-+               if (do_utimes(fname, modtime, 0, mode, fileflags) == 0)
-                        break;
- #else
--               if (do_utime(fname, modtime, 0) == 0)
-+               if (do_utime(fname, modtime, 0, mode, fileflags) == 0)
+                switch_step++;
+@@ -165,6 +203,13 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
+                if (do_utime(fname, modtime, mod_nsec) == 0)
                         break;
  #endif
++#ifdef SUPPORT_FORCE_CHANGE
++               if (force_change && errno == EPERM
++                && try_a_force_change(fname, modtime, mod_nsec, mode, fileflags) == 0)
++                       break;
++#else
++               fileflags = 0; /* avoid compiler warning */
++#endif
  
+                return -1;
+        }
 diff --git a/xattrs.c b/xattrs.c
 --- a/xattrs.c
 +++ b/xattrs.c
-@@ -1042,7 +1042,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
+@@ -1045,7 +1045,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
         mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS)
              | (S_ISDIR(fst.st_mode) ? 0700 : 0600);
         if (fst.st_mode != mode)
@@ -1445 +1127 @@
         if (!IS_DEVICE(fst.st_mode))
                 fst.st_rdev = 0; /* just in case */
  
-diff -up a/config.h.in b/config.h.in
+diff -Nurp a/config.h.in b/config.h.in
 --- a/config.h.in
 +++ b/config.h.in
-@@ -70,6 +70,9 @@
+@@ -76,6 +76,9 @@
  /* Define to 1 if vsprintf has a C99-compatible return value */
  #undef HAVE_C99_VSNPRINTF
  
@@ -1458 +1140 @@
  /* Define to 1 if you have the `chmod' function. */
  #undef HAVE_CHMOD
  
-diff -up a/configure.sh b/configure.sh
+diff -Nurp a/configure.sh b/configure.sh
 --- a/configure.sh
 +++ b/configure.sh
-@@ -7444,6 +7444,7 @@ fi
+@@ -7652,6 +7652,7 @@ fi
  
  for ac_func in waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
      fchmod fstat ftruncate strchr readlink link utime utimes lutimes strftime \
@@ -1469 +1151 @@
      memmove lchown vsnprintf snprintf vasprintf asprintf setsid strpbrk \
      strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
      setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
-diff -up a/proto.h b/proto.h
+diff -Nurp a/proto.h b/proto.h
 --- a/proto.h
 +++ b/proto.h
-@@ -274,6 +274,9 @@ int read_ndx_and_attrs(int f_in, int *if
+@@ -286,6 +286,8 @@ int read_ndx_and_attrs(int f_in, int f_o
  void free_sums(struct sum_struct *s);
  mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
                  int exists);
-+uint32 make_mutable(const char *fname, mode_t *mode_ptr, uint32 fileflags, uint32 iflags);
++int make_mutable(const char *fname, mode_t mode, uint32 fileflags, uint32 iflags);
 +int undo_make_mutable(const char *fname, uint32 fileflags);
-+int make_parentdir_mutable(const char *fname, uint32 iflags, char *parent_dirbuf, int parent_dirbuf_size);
  int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
                    const char *fnamecmp, int flags);
- RETSIGTYPE sig_int(UNUSED(int val));
-@@ -297,11 +300,12 @@ void set_socket_options(int fd, char *op
- int do_unlink(const char *fname);
- int do_symlink(const char *fname1, const char *fname2);
+ RETSIGTYPE sig_int(int sig_num);
+@@ -310,11 +312,12 @@ int do_unlink(const char *fname);
+ int do_symlink(const char *lnk, const char *fname);
+ ssize_t do_readlink(const char *path, char *buf, size_t bufsiz);
  int do_link(const char *fname1, const char *fname2);
 -int do_lchown(const char *path, uid_t owner, gid_t group);
 +int do_lchown(const char *path, uid_t owner, gid_t group, mode_t mode, uint32 fileflags);
@@ -1497 +1178 @@
  int do_rename(const char *fname1, const char *fname2);
  int do_ftruncate(int fd, OFF_T size);
  void trim_trailing_slashes(char *name);
-@@ -311,10 +315,10 @@ int do_stat(const char *fname, STRUCT_ST
- int do_lstat(const char *fname, STRUCT_STAT *st);
- int do_fstat(int fd, STRUCT_STAT *st);
- OFF_T do_lseek(int fd, OFF_T offset, int whence);
--int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec);
--int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec);
--int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec);
--int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec));
-+int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags);
-+int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags);
-+int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags);
-+int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec), mode_t mode, uint32 fileflags);
- void set_compression(const char *fname);
- void send_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
-                int32 n, int32 toklen);
-@@ -334,7 +338,7 @@ int fd_pair(int fd[2]);
+@@ -353,7 +356,7 @@ void set_nonblocking(int fd);
+ void set_blocking(int fd);
+ int fd_pair(int fd[2]);
  void print_child_argv(const char *prefix, char **cmd);
- NORETURN void out_of_memory(const char *str);
- NORETURN void overflow_exit(const char *str);
--int set_modtime(const char *fname, time_t modtime, mode_t mode);
-+int set_modtime(const char *fname, time_t modtime, mode_t mode, uint32 fileflags);
- int mkdir_defmode(char *fname);
- int create_directory_path(char *fname);
+-int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode);
++int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags);
+ int make_path(char *fname, int flags);
  int full_write(int desc, const char *ptr, size_t len);
-diff -up a/rsync.1 b/rsync.1
+ int copy_file(const char *source, const char *dest, int ofd, mode_t mode);
+diff -Nurp a/rsync.1 b/rsync.1
 --- a/rsync.1
 +++ b/rsync.1
-@@ -431,6 +431,7 @@ to the detailed description below for a
+@@ -438,6 +438,7 @@ to the detailed description below for a
   \-K, \-\-keep\-dirlinks         treat symlinked dir on receiver as dir
   \-H, \-\-hard\-links            preserve hard links
   \-p, \-\-perms                 preserve permissions
@@ -1532 +1198 @@
   \-E, \-\-executability         preserve executability
       \-\-chmod=CHMOD           affect file and/or directory permissions
   \-A, \-\-acls                  preserve ACLs (implies \-p)
-@@ -462,7 +463,10 @@ to the detailed description below for a
-      \-\-delete\-after          receiver deletes after transfer, not during
-      \-\-delete\-excluded       also delete excluded files from dest dirs
+@@ -473,7 +474,10 @@ to the detailed description below for a
+      \-\-ignore\-missing\-args   ignore missing source args without error
+      \-\-delete\-missing\-args   delete missing source args from destination
       \-\-ignore\-errors         delete even if there are I/O errors
 -     \-\-force                 force deletion of dirs even if not empty
 +     \-\-force\-delete          force deletion of dirs even if not empty
@@ -1544 +1210 @@
       \-\-max\-delete=NUM        don'\&t delete more than NUM files
       \-\-max\-size=SIZE         don'\&t transfer any file larger than SIZE
       \-\-min\-size=SIZE         don'\&t transfer any file smaller than SIZE
-@@ -658,7 +662,8 @@ specified, in which case \fB\-r\fP is no
+@@ -743,7 +747,8 @@ specified, in which case \fB\-r\fP is no
  .IP 
  Note that \fB\-a\fP \fBdoes not preserve hardlinks\fP, because
  finding multiply\-linked files is expensive.  You must separately
@@ -1554 +1220 @@
  .IP 
  .IP "\-\-no\-OPTION"
  You may turn off one or more implied options by prefixing
-@@ -975,7 +980,7 @@ they would be using \fB\-\-copy\-links\f
+@@ -1080,7 +1085,7 @@ they would be using \fB\-\-copy\-links\f
  Without this option, if the sending side has replaced a directory with a
  symlink to a directory, the receiving side will delete anything that is in
  the way of the new symlink, including a directory hierarchy (as long as
@@ -1563 +1229 @@
  .IP 
  See also \fB\-\-keep\-dirlinks\fP for an analogous option for the receiving
  side.
-@@ -1162,6 +1167,33 @@ Note that this option does not copy rsyn
+@@ -1267,6 +1272,33 @@ Note that this option does not copy rsyn
  used by \fB\-\-fake\-super\fP) unless you repeat the option (e.g. \-XX).  This
  \(dq\&copy all xattrs\(dq\& mode cannot be used with \fB\-\-fake\-super\fP.
  .IP 
@@ -1592 +1258 @@
 +This option causes rsync to disable system\-immutable
 +flags on files and directories that are being updated or deleted on the
 +receiving side.  It does not try to affect user flags.  This option overrides
-+\fB\-\-force\-change\fP and \fB\-\-force\-schange\fP.
++\fB\-\-force\-change\fP and \fB\-\-force\-uchange\fP.
 +.IP 
  .IP "\fB\-\-chmod\fP"
  This option tells rsync to apply one or more
  comma\-separated \(dq\&chmod\(dq\& modes to the permission of the files in the
-@@ -1472,13 +1504,14 @@ See \fB\-\-delete\fP (which is implied)
+@@ -1633,13 +1665,14 @@ display as a \(dq\&*missing\(dq\& entry
  Tells \fB\-\-delete\fP to go ahead and delete files
  even when there are I/O errors.
  .IP 
@@ -1615 +1281 @@
  \fB\-\-recursive\fP option was also enabled.
  .IP 
  .IP "\fB\-\-max\-delete=NUM\fP"
-@@ -2034,7 +2067,7 @@ with older versions of rsync, but that a
+@@ -2357,7 +2390,7 @@ with older versions of rsync, but that a
  verbose messages).
  .IP 
  The \(dq\&%i\(dq\& escape has a cryptic output that is 11 letters long.  The general
@@ -1624 +1290 @@
  type of update being done, \fBX\fP is replaced by the file\-type, and the
  other letters represent attributes that may be output if they are being
  modified.
-@@ -2104,7 +2137,7 @@ sender\(cq\&s value (requires \fB\-\-own
+@@ -2427,7 +2460,7 @@ sender\(cq\&s value (requires \fB\-\-own
  A \fBg\fP means the group is different and is being updated to the
  sender\(cq\&s value (requires \fB\-\-group\fP and the authority to set the group).
  .IP o 

rsync/files/patch-hfs-compression-options.diff

@@ -1 @@
-This patch adds support for HFS+ compression status to be
-shown during options display.
-
-To use this patch, run these commands for a successful build:
-
-    patch -p1 <patches/fileflags.diff
-    patch -p1 <patches/crtimes.diff
-    patch -p1 <patches/hfs-compression.diff
-    patch -p1 <patches/hfs-compression-options.diff
-    ./prepare-source
-    ./configure
-    make
-
-TODO:
- - Should rsync try to treat the compressed data as file data and use the
-   rsync algorithm on the data transfer?
-
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -228,6 +228,7 @@
+@@ -579,6 +579,7 @@
         char const *iconv = "no ";
         char const *ipv6 = "no ";
         char const *fileflags = "no ";
@@ -26 +9 @@
         STRUCT_STAT *dumstat;
  
  #if SUBPROTOCOL_VERSION != 0
-@@ -264,6 +265,9 @@
+@@ -618,6 +619,9 @@
  #ifdef SUPPORT_FILEFLAGS
         fileflags = "";
  #endif
@@ -36 +19 @@
  
         rprintf(f, "%s  version %s  protocol version %d%s\n",
                 RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
-@@ -277,8 +281,10 @@
+@@ -631,8 +635,10 @@
                 (int)(sizeof (int64) * 8));
         rprintf(f, "    %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
                 got_socketpair, hardlinks, links, ipv6, have_inplace);
--       rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sfile-flags\n",
-+       rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sfile-flags,\n",
-                have_inplace, acls, xattrs, iconv, symtimes, fileflags);
-+       rprintf(f, "    %sHFS-compression\n",
-+               hfscomp);
+-       rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sprealloc, %sfile-flags\n",
++       rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sprealloc, %sfile-flags,\n",
+                have_inplace, acls, xattrs, iconv, symtimes, prealloc, fileflags);
++       rprintf(f, "    %sHFS-compression\n",
++               hfscomp);
  
  #ifdef MAINTAINER_MODE
         rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());

rsync/files/patch-hfs-compression.diff

@@ -18 +18 @@
  - Should rsync try to treat the compressed data as file data and use the
    rsync algorithm on the data transfer?
 
-based-on: patch/b3.0.x/crtimes
+based-on: patch/master/crtimes
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -1496,6 +1496,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
- #ifdef SUPPORT_FILEFLAGS
-                        sx.st.st_flags = preserve_fileflags ? F_FFLAGS(file) : 0;
- #endif
+@@ -1583,6 +1583,9 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
+ #ifdef SUPPORT_XATTRS
+                if (preserve_xattrs) {
+                        sx.st.st_mode = file->mode;
++                       if (preserve_fileflags)
++                               sx.st.st_flags = F_FFLAGS(file);
 +                       sx.st.st_mtime = file->modtime; /* get_xattr needs mtime for decmpfs xattrs */
-                        sx.xattr = NULL;
                         if (get_xattr(fname, &sx) < 0) {
                                 io_error |= IOERR_GENERAL;
+                                return NULL;
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
-@@ -39,6 +39,7 @@ extern int keep_dirlinks;
- extern int force_change;
+@@ -37,6 +37,7 @@ extern int implied_dirs;
+ extern int keep_dirlinks;
  extern int preserve_acls;
  extern int preserve_xattrs;
 +extern int preserve_hfs_compression;
  extern int preserve_links;
  extern int preserve_devices;
  extern int preserve_specials;
-@@ -1888,6 +1889,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1762,6 +1763,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                         fname, fnamecmpbuf);
                         }
                         sx.st.st_size = F_LENGTH(fuzzy_file);
@@ -55 +57 @@
 +#endif
                         statret = 0;
                         fnamecmp = fnamecmpbuf;
-                        fnamecmp_type = FNAMECMP_FUZZY;
-@@ -2072,6 +2081,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+                }
+@@ -1929,6 +1938,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
         if (read_batch)
                 goto cleanup;
  
@@ -78 +80 @@
 diff --git a/lib/sysxattrs.c b/lib/sysxattrs.c
 --- a/lib/sysxattrs.c
 +++ b/lib/sysxattrs.c
-@@ -22,6 +22,17 @@
+@@ -22,10 +22,17 @@
  #include "rsync.h"
  #include "sysxattrs.h"
  
 +extern int preserve_hfs_compression;
 +
-+#ifdef HAVE_OSX_XATTRS
+ #ifdef SUPPORT_XATTRS
+ 
+ #ifdef HAVE_OSX_XATTRS
 +#ifndef XATTR_SHOWCOMPRESSION
 +#define XATTR_SHOWCOMPRESSION 0x0020
 +#endif
-+#define GETXATTR_FETCH_LIMIT (64*1024*1024)
+ #define GETXATTR_FETCH_LIMIT (64*1024*1024)
 +
 +int xattr_options = XATTR_NOFOLLOW;
-+#endif
-+
- #ifdef SUPPORT_XATTRS
+ #endif
  
  #if defined HAVE_LINUX_XATTRS
-@@ -55,7 +66,27 @@ ssize_t sys_llistxattr(const char *path, char *list, size_t size)
+@@ -59,7 +66,12 @@ ssize_t sys_llistxattr(const char *path, char *list, size_t size)
  
  ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
  {
--       return getxattr(path, name, value, size, 0, XATTR_NOFOLLOW);
+-       ssize_t len = getxattr(path, name, value, size, 0, XATTR_NOFOLLOW);
 +       ssize_t len;
 +
 +       if (preserve_hfs_compression)
 +               xattr_options |= XATTR_SHOWCOMPRESSION;
 +
 +       len = getxattr(path, name, value, size, 0, xattr_options);
-+
-+       /* If we're retrieving data, handle resource forks > 64MB specially */
-+       if (value != NULL && strcmp(name, XATTR_RESOURCEFORK_NAME) == 0 && len == GETXATTR_FETCH_LIMIT) {
-+               /* getxattr will only return 64MB of data at a time, need to call again with a new offset */
-+               u_int32_t offset = GETXATTR_FETCH_LIMIT;
-+               ssize_t data_retrieved = len;
-+               while (data_retrieved < (ssize_t)size) {
-+                       len = getxattr(path, name, value + offset, size - data_retrieved, offset, xattr_options);
-+                       data_retrieved += len;
-+                       offset += (u_int32_t)len;
-+               }
-+               len = data_retrieved;
-+       }
-+
-+       return len;
- }
  
- ssize_t sys_fgetxattr(int filedes, const char *name, void *value, size_t size)
-@@ -70,12 +101,16 @@ int sys_lsetxattr(const char *path, const char *name, const void *value, size_t
+        /* If we're retrieving data, handle resource forks > 64MB specially */
+        if (value != NULL && len == GETXATTR_FETCH_LIMIT && (size_t)len < size) {
+@@ -67,7 +79,7 @@ ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t si
+                u_int32_t offset = len;
+                size_t data_retrieved = len;
+                while (data_retrieved < size) {
+-                       len = getxattr(path, name, value + offset, size - data_retrieved, offset, XATTR_NOFOLLOW);
++                       len = getxattr(path, name, value + offset, size - data_retrieved, offset, xattr_options);
+                        if (len <= 0)
+                                break;
+                        data_retrieved += len;
+@@ -91,12 +103,16 @@ int sys_lsetxattr(const char *path, const char *name, const void *value, size_t
  
  int sys_lremovexattr(const char *path, const char *name)
  {
@@ -156 +152 @@
 +#include <sys/mount.h> /* For statfs() */
 +#endif
  
- extern int verbose;
  extern int dry_run;
-@@ -50,7 +54,9 @@ extern int copy_dirlinks;
+ extern int list_only;
+@@ -53,6 +57,7 @@ extern int copy_dirlinks;
  extern int copy_unsafe_links;
  extern int keep_dirlinks;
  extern int preserve_hard_links;
 +extern int preserve_hfs_compression;
  extern int protocol_version;
-+extern int force_change;
+ extern int force_change;
  extern int file_total;
- extern int recurse;
- extern int xfer_dirs;
-@@ -490,6 +496,43 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
+@@ -107,6 +112,7 @@ int daemon_over_rsh = 0;
+ mode_t orig_umask = 0;
+ int batch_gen_fd = -1;
+ int sender_keeps_checksum = 0;
++int fs_supports_hfs_compression = 0;
+ 
+ /* There's probably never more than at most 2 outstanding child processes,
+  * but set it higher, just in case. */
+@@ -559,6 +565,43 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
         return 0; /* not reached */
  }
  
@@ -212 +214 @@
  /* The receiving side operates in one of two modes:
   *
   * 1. it receives any number of files into a destination directory,
-@@ -548,6 +591,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
+@@ -617,6 +660,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
                                 exit_cleanup(RERR_FILESELECT);
                         }
                         filesystem_dev = st.st_dev; /* ensures --force works right w/-x */
@@ -222 +224 @@
                         return NULL;
                 }
                 if (file_total > 1) {
-@@ -608,7 +654,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
+@@ -677,7 +723,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
                                 full_fname(dest_path));
                         exit_cleanup(RERR_FILESELECT);
                 }
@@ -233 +235 @@
                 return NULL;
         }
  
-@@ -628,6 +676,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
+@@ -697,6 +745,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
                         full_fname(dest_path));
                 exit_cleanup(RERR_FILESELECT);
         }
@@ -243 +245 @@
         *cp = '/';
  
         return cp + 1;
-@@ -981,7 +1032,6 @@ int child_main(int argc, char *argv[])
-        return 0;
- }
- 
--
- void start_server(int f_in, int f_out, int argc, char *argv[])
- {
-        set_nonblocking(f_in);
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -52,6 +52,7 @@ int preserve_links = 0;
+@@ -54,6 +54,7 @@ int preserve_links = 0;
  int preserve_hard_links = 0;
  int preserve_acls = 0;
  int preserve_xattrs = 0;
@@ -262 +256 @@
  int preserve_perms = 0;
  int preserve_fileflags = 0;
  int preserve_executability = 0;
-@@ -355,6 +356,10 @@ void usage(enum logcode F)
+@@ -713,6 +714,10 @@ void usage(enum logcode F)
  #ifdef SUPPORT_XATTRS
    rprintf(F," -X, --xattrs                preserve extended attributes\n");
  #endif
@@ -273 +267 @@
    rprintf(F," -o, --owner                 preserve owner (super-user only)\n");
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F,"     --devices               preserve device files (super-user only)\n");
-@@ -588,6 +593,12 @@ static struct poptOption long_options[] = {
+@@ -974,6 +979,12 @@ static struct poptOption long_options[] = {
    {"force-uchange",    0,  POPT_ARG_VAL,    &force_change, USR_IMMUTABLE, 0, 0 },
    {"force-schange",    0,  POPT_ARG_VAL,    &force_change, SYS_IMMUTABLE, 0, 0 },
  #endif
@@ -286 +280 @@
    {"ignore-errors",    0,  POPT_ARG_VAL,    &ignore_errors, 1, 0, 0 },
    {"no-ignore-errors", 0,  POPT_ARG_VAL,    &ignore_errors, 0, 0, 0 },
    {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
-@@ -1362,6 +1373,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1974,6 +1985,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
         }
  #endif
  
@@ -299 +293 @@
 +       }
 +#endif
 +
-        if (write_batch && read_batch) {
+        if (block_size > MAX_BLOCK_SIZE) {
                 snprintf(err_buf, sizeof err_buf,
-                        "--write-batch and --read-batch can not be used together\n");
-@@ -1915,6 +1935,11 @@ void server_options(char **args, int *argc_p)
+                         "--block-size=%lu is too large (max: %u)\n", block_size, MAX_BLOCK_SIZE);
+@@ -2573,6 +2593,11 @@ void server_options(char **args, int *argc_p)
         if (preserve_fileflags)
                 args[ac++] = "--fileflags";
  
@@ -317 +311 @@
 diff --git a/rsync.c b/rsync.c
 --- a/rsync.c
 +++ b/rsync.c
-@@ -498,8 +498,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -573,8 +573,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
  #ifdef SUPPORT_XATTRS
         if (am_root < 0)
                 set_stat_xattr(fname, file, new_mode);
@@ -333 +327 @@
  #endif
  
         if (!preserve_times
-@@ -510,6 +516,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -585,6 +591,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
         if (sxp->st.st_ino == 2 && S_ISDIR(sxp->st.st_mode))
                 flags |= ATTRS_SKIP_CRTIME;
         if (!(flags & ATTRS_SKIP_MTIME)
@@ -341 +335 @@
 +           && !(sxp->st.st_flags & UF_COMPRESSED) /* setting this alters mtime, so defer to after set_fileflags */
 +#endif
             && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
-                int ret = set_modtime(fname, file->modtime, sxp->st.st_mode, ST_FLAGS(sxp->st));
+                int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode, ST_FLAGS(sxp->st));
                 if (ret < 0) {
-@@ -620,6 +629,16 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -643,6 +652,16 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
                  && !set_fileflags(fname, fileflags))
                         goto cleanup;
                 updated = 1;
 +#ifdef SUPPORT_HFS_COMPRESSION
-+               int ret = set_modtime(fname, file->modtime, new_mode, fileflags);
++               int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), new_mode, fileflags);
 +               if (ret < 0) {
 +                       rsyserr(FERROR_XFER, errno, "failed to set times on %s",
 +                               full_fname(fname));
@@ -363 +357 @@
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -509,6 +509,17 @@ typedef unsigned int size_t;
+@@ -549,6 +549,17 @@ typedef unsigned int size_t;
  #define ST_FLAGS(st) NO_FFLAGS
  #endif
  
@@ -384 +378 @@
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -360,6 +360,8 @@ to the detailed description below for a complete description.  verb(
+@@ -367,6 +367,8 @@ to the detailed description below for a complete description.  verb(
       --chmod=CHMOD           affect file and/or directory permissions
   -A, --acls                  preserve ACLs (implies -p)
   -X, --xattrs                preserve extended attributes
@@ -393 +387 @@
   -o, --owner                 preserve owner (super-user only)
   -g, --group                 preserve group
       --devices               preserve device files (super-user only)
-@@ -1038,6 +1040,42 @@ flags on files and directories that are being updated or deleted on the
+@@ -1135,6 +1137,42 @@ flags on files and directories that are being updated or deleted on the
  receiving side.  It does not try to affect user flags.  This option overrides
- bf(--force-change) and bf(--force-schange).
+ bf(--force-change) and bf(--force-uchange).
  
 +dit(bf(--hfs-compression)) This option causes rsync to preserve HFS+
 +compression if the destination filesystem supports it.  If the destination
@@ -439 +433 @@
 diff --git a/t_stub.c b/t_stub.c
 --- a/t_stub.c
 +++ b/t_stub.c
-@@ -29,6 +29,7 @@ int module_dirlen = 0;
- int force_change = 0;
+@@ -32,6 +32,7 @@ int force_change = 0;
+ int preserve_acls = 0;
  int preserve_times = 0;
  int preserve_xattrs = 0;
 +int preserve_hfs_compression = 0;
- mode_t orig_umask = 002;
  char *partial_dir;
  char *module_dir;
+ filter_rule_list daemon_filter_list;
 diff --git a/xattrs.c b/xattrs.c
 --- a/xattrs.c
 +++ b/xattrs.c
-@@ -32,6 +32,7 @@ extern int am_generator;
+@@ -33,6 +33,7 @@ extern int am_generator;
  extern int read_only;
  extern int list_only;
  extern int preserve_xattrs;
@@ -458 +452 @@
  extern int preserve_links;
  extern int preserve_devices;
  extern int preserve_specials;
-@@ -40,6 +41,10 @@ extern int checksum_seed;
+@@ -41,6 +42,10 @@ extern int checksum_seed;
  #define RSYNC_XAL_INITIAL 5
  #define RSYNC_XAL_LIST_INITIAL 100
  
@@ -469 +463 @@
  #define MAX_FULL_DATUM 32
  
  #define HAS_PREFIX(str, prfx) (*(str) == *(prfx) \
-@@ -72,6 +77,17 @@ extern int checksum_seed;
+@@ -73,6 +78,17 @@ extern int checksum_seed;
  #define XDEF_ACL_SUFFIX "dacl"
  #define XDEF_ACL_ATTR RSYNC_PREFIX "%" XDEF_ACL_SUFFIX
  
@@ -487 +481 @@
  typedef struct {
         char *datum, *name;
         size_t datum_len, name_len;
-@@ -166,8 +182,7 @@ static ssize_t get_xattr_names(const char *fname)
+@@ -167,8 +183,7 @@ static ssize_t get_xattr_names(const char *fname)
  /* On entry, the *len_ptr parameter contains the size of the extra space we
   * should allocate when we create a buffer for the data.  On exit, it contains
   * the length of the datum. */
@@ -497 +491 @@
  {
         size_t datum_len = sys_lgetxattr(fname, name, NULL, 0);
         size_t extra_len = *len_ptr;
-@@ -176,7 +191,7 @@ static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr
+@@ -177,7 +192,7 @@ static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr
         *len_ptr = datum_len;
  
         if (datum_len == (size_t)-1) {
@@ -506 +500 @@
                         return NULL;
                 rsyserr(FERROR_XFER, errno,
                         "get_xattr_data: lgetxattr(\"%s\",\"%s\",0) failed",
-@@ -184,6 +199,15 @@ static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr
+@@ -185,6 +200,15 @@ static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr
                 return NULL;
         }
  
@@ -522 +516 @@
         if (!datum_len && !extra_len)
                 extra_len = 1; /* request non-zero amount of memory */
         if (datum_len + extra_len < datum_len)
-@@ -212,7 +236,29 @@ static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr
+@@ -213,7 +237,29 @@ static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr
         return ptr;
  }
  
@@ -553 +547 @@
  {
         ssize_t list_len, name_len;
         size_t datum_len, name_offset;
-@@ -221,7 +267,8 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
-        int user_only = am_sender ? 0 : am_root <= 0;
+@@ -222,7 +268,8 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
+        int user_only = am_sender ? 0 : !am_root;
  #endif
         rsync_xa *rxa;
 -       int count;
@@ -563 +557 @@
  
         /* This puts the name list into the "namebuf" buffer. */
         if ((list_len = get_xattr_names(fname)) < 0)
-@@ -251,20 +298,22 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
+@@ -252,20 +299,22 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
                 }
  
                 datum_len = name_len; /* Pass extra size to get_xattr_data() */
@@ -592 +586 @@
                 } else
                         name_offset = datum_len;
  
-@@ -309,7 +358,7 @@ int get_xattr(const char *fname, stat_x *sxp)
-                        return 0;
-        }
+@@ -311,7 +360,7 @@ int get_xattr(const char *fname, stat_x *sxp)
+        } else if (IS_MISSING_FILE(sxp->st))
+                return 0;
  
 -       if (rsync_xal_get(fname, sxp->xattr) < 0) {
 +       if (rsync_xal_get(fname, sxp) < 0) {
                 free_xattr(sxp);
                 return -1;
         }
-@@ -344,6 +393,8 @@ int copy_xattrs(const char *source, const char *dest)
+@@ -346,6 +395,8 @@ int copy_xattrs(const char *source, const char *dest)
                 datum_len = 0;
                 if (!(ptr = get_xattr_data(source, name, &datum_len, 0)))
                         return -1;
@@ -610 +604 @@
                 if (sys_lsetxattr(dest, name, ptr, datum_len) < 0) {
                         int save_errno = errno ? errno : EINVAL;
                         rsyserr(FERROR_XFER, errno,
-@@ -360,6 +411,10 @@ int copy_xattrs(const char *source, const char *dest)
+@@ -362,6 +413,10 @@ int copy_xattrs(const char *source, const char *dest)
  
  static int find_matching_xattr(item_list *xalp)
  {
@@ -621 +615 @@
         size_t i, j;
         item_list *lst = rsync_xal_l.items;
  
-@@ -393,6 +448,7 @@ static int find_matching_xattr(item_list *xalp)
+@@ -395,6 +450,7 @@ static int find_matching_xattr(item_list *xalp)
         }
  
         return -1;
@@ -629 +623 @@
  }
  
  /* Store *xalp on the end of rsync_xal_l */
-@@ -572,11 +628,13 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
+@@ -574,11 +630,13 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
  
                         /* Re-read the long datum. */
                         if (!(ptr = get_xattr_data(fname, rxa->name, &len, 0))) {
@@ -642 +636 @@
  
 +                       assert(ptr != UNREAD_DATA);
                         write_varint(f_out, len); /* length might have changed! */
-                        write_buf(f_out, ptr, len);
+                        write_bigbuf(f_out, ptr, len);
                         free(ptr);
-@@ -792,7 +850,7 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
+@@ -795,7 +853,7 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
         int user_only = am_root <= 0;
  #endif
         size_t name_len;
@@ -653 +647 @@
  
         /* This puts the current name list into the "namebuf" buffer. */
         if ((list_len = get_xattr_names(fname)) < 0)
-@@ -804,7 +862,10 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
+@@ -807,7 +865,10 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
                 if (XATTR_ABBREV(rxas[i])) {
                         /* See if the fnamecmp version is identical. */
                         len = name_len = rxas[i].name_len;
@@ -665 +659 @@
                           still_abbrev:
                                 if (am_generator)
                                         continue;
-@@ -813,14 +874,14 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
+@@ -816,14 +877,14 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
                                 ret = -1;
                                 continue;
                         }
@@ -683 +677 @@
                         if (memcmp(sum, rxas[i].datum + 1, MAX_DIGEST_LEN) != 0) {
                                 free(ptr);
                                 goto still_abbrev;
-@@ -889,6 +950,10 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
+@@ -892,6 +953,10 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
                 }
         }
  
@@ -694 +688 @@
         return ret;
  }
  
-@@ -935,7 +1000,7 @@ char *get_xattr_acl(const char *fname, int is_access_acl, size_t *len_p)
+@@ -938,7 +1003,7 @@ char *get_xattr_acl(const char *fname, int is_access_acl, size_t *len_p)
  {
         const char *name = is_access_acl ? XACC_ACL_ATTR : XDEF_ACL_ATTR;
         *len_p = 0; /* no extra data alloc needed from get_xattr_data() */
@@ -703 +697 @@
  }
  
  int set_xattr_acl(const char *fname, int is_access_acl, const char *buf, size_t buf_len)
-@@ -1078,11 +1143,33 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
+@@ -1081,11 +1146,33 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
         return 0;
  }
  
@@ -737 +731 @@
         return ret;
  }
  
-@@ -1091,6 +1178,9 @@ int x_lstat(const char *fname, STRUCT_STAT *fst, STRUCT_STAT *xst)
+@@ -1094,6 +1181,9 @@ int x_lstat(const char *fname, STRUCT_STAT *fst, STRUCT_STAT *xst)
         int ret = do_lstat(fname, fst);
         if ((ret < 0 || get_stat_xattr(fname, -1, fst, xst) < 0) && xst)
                 xst->st_mode = 0;
@@ -747 +741 @@
         return ret;
  }
  
-@@ -1099,6 +1189,9 @@ int x_fstat(int fd, STRUCT_STAT *fst, STRUCT_STAT *xst)
+@@ -1102,6 +1192,9 @@ int x_fstat(int fd, STRUCT_STAT *fst, STRUCT_STAT *xst)
         int ret = do_fstat(fd, fst);
         if ((ret < 0 || get_stat_xattr(NULL, fd, fst, xst) < 0) && xst)
                 xst->st_mode = 0;
@@ -757 +751 @@
         return ret;
  }
  
-diff -up a/rsync.1 b/rsync.1
+diff -Nurp a/rsync.1 b/rsync.1
 --- a/rsync.1
 +++ b/rsync.1
-@@ -436,6 +436,8 @@ to the detailed description below for a
+@@ -443,6 +443,8 @@ to the detailed description below for a
       \-\-chmod=CHMOD           affect file and/or directory permissions
   \-A, \-\-acls                  preserve ACLs (implies \-p)
   \-X, \-\-xattrs                preserve extended attributes
@@ -769 +763 @@
   \-o, \-\-owner                 preserve owner (super\-user only)
   \-g, \-\-group                 preserve group
       \-\-devices               preserve device files (super\-user only)
-@@ -1195,6 +1197,44 @@ flags on files and directories that are
+@@ -1300,6 +1302,44 @@ flags on files and directories that are
  receiving side.  It does not try to affect user flags.  This option overrides
- \fB\-\-force\-change\fP and \fB\-\-force\-schange\fP.
+ \fB\-\-force\-change\fP and \fB\-\-force\-uchange\fP.
  .IP 
 +.IP "\fB\-\-hfs\-compression\fP"
 +This option causes rsync to preserve HFS+