X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/58b399b9a42eacea1953e68f527f79903bb39546..4c15e80040f6ac2fc79d599d1722cf209cc30536:/flags.diff

diff --git a/flags.diff b/flags.diff
index 642d483..2673e91 100644
--- a/flags.diff
+++ b/flags.diff
@@ -8,124 +8,143 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
-TODO: fix --delete-delay to work with --flags option.
-
---- old/compat.c
-+++ new/compat.c
-@@ -94,6 +94,8 @@ void setup_protocol(int f_out,int f_in)
- 		preserve_uid = ++file_extra_cnt;
+diff --git a/compat.c b/compat.c
+--- a/compat.c
++++ b/compat.c
+@@ -44,6 +44,7 @@ extern int protocol_version;
+ extern int protect_args;
+ extern int preserve_uid;
+ extern int preserve_gid;
++extern int preserve_fileflags;
+ extern int preserve_acls;
+ extern int preserve_xattrs;
+ extern int need_messages_from_generator;
+@@ -60,7 +61,7 @@ extern iconv_t ic_send, ic_recv;
+ #endif
+ 
+ /* These index values are for the file-list's extra-attribute array. */
+-int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
++int uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
+ 
+ #ifdef ICONV_OPTION
+ int filesfrom_convert = 0;
+@@ -124,6 +125,8 @@ void setup_protocol(int f_out,int f_in)
+ 		uid_ndx = ++file_extra_cnt;
  	if (preserve_gid)
- 		preserve_gid = ++file_extra_cnt;
+ 		gid_ndx = ++file_extra_cnt;
 +	if (preserve_fileflags)
-+		preserve_fileflags = ++file_extra_cnt;
++		fileflags_ndx = ++file_extra_cnt;
  	if (preserve_acls && !am_sender)
- 		preserve_acls = ++file_extra_cnt;
+ 		acls_ndx = ++file_extra_cnt;
  	if (preserve_xattrs)
---- old/configure.in
-+++ new/configure.in
-@@ -560,7 +560,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -551,7 +551,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
      memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \
      strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
      setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
--    strerror putenv iconv_open locale_charset nl_langinfo \
-+    chflags strerror putenv iconv_open locale_charset nl_langinfo \
-     sigaction sigprocmask)
- 
- AC_CHECK_FUNCS(getpgrp tcgetpgrp)
---- old/flist.c
-+++ new/flist.c
-@@ -49,6 +49,7 @@ extern int preserve_links;
+-    strerror putenv iconv_open locale_charset nl_langinfo getxattr \
++    chflags strerror putenv iconv_open locale_charset nl_langinfo getxattr \
+     extattr_get_link sigaction sigprocmask setattrlist)
+ 
+ dnl cygwin iconv.h defines iconv_open as libiconv_open
+diff --git a/flist.c b/flist.c
+--- a/flist.c
++++ b/flist.c
+@@ -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 preserve_uid;
- extern int preserve_gid;
- extern int relative_paths;
-@@ -340,6 +341,9 @@ static void send_file_entry(int f, struc
++extern int fileflags_ndx;
+ extern int uid_ndx;
+ extern int gid_ndx;
+ extern int eol_nulls;
+@@ -344,6 +345,9 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_
  {
  	static time_t modtime;
  	static mode_t mode;
 +#ifdef SUPPORT_FLAGS
 +	static uint32 fileflags;
 +#endif
+ #ifdef SUPPORT_HARD_LINKS
  	static int64 dev;
- 	static dev_t rdev;
- 	static uint32 rdev_major;
-@@ -388,6 +392,12 @@ static void send_file_entry(int f, struc
- 		flags |= XMIT_SAME_MODE;
+ #endif
+@@ -403,6 +407,12 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_
+ 		xflags |= XMIT_SAME_MODE;
  	else
  		mode = file->mode;
 +#ifdef SUPPORT_FLAGS
-+ 	if (F_FFLAGS(file) == fileflags)
-+		flags |= XMIT_SAME_FLAGS;
++	if (F_FFLAGS(file) == fileflags)
++		xflags |= XMIT_SAME_FLAGS;
 +	else
 +		fileflags = F_FFLAGS(file);
 +#endif
+ 
  	if ((preserve_devices && IS_DEVICE(mode))
  	 || (preserve_specials && IS_SPECIAL(mode))) {
- 		if (protocol_version < 28) {
-@@ -505,6 +515,10 @@ static void send_file_entry(int f, struc
+@@ -522,6 +532,10 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_
  	}
- 	if (!(flags & XMIT_SAME_MODE))
+ 	if (!(xflags & XMIT_SAME_MODE))
  		write_int(f, to_wire_mode(mode));
 +#ifdef SUPPORT_FLAGS
-+ 	if (preserve_fileflags && !(flags & XMIT_SAME_FLAGS))
++	if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS))
 +		write_int(f, (int)fileflags);
 +#endif
- 	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
+ 	if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
  		if (protocol_version < 30)
  			write_int(f, uid);
-@@ -593,6 +607,9 @@ static struct file_struct *recv_file_ent
+@@ -610,6 +624,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
  {
  	static int64 modtime;
  	static mode_t mode;
 +#ifdef SUPPORT_FLAGS
-+ 	static uint32 fileflags;
++	static uint32 fileflags;
 +#endif
+ #ifdef SUPPORT_HARD_LINKS
  	static int64 dev;
- 	static dev_t rdev;
- 	static uint32 rdev_major;
-@@ -725,9 +742,12 @@ static struct file_struct *recv_file_ent
+ #endif
+@@ -741,9 +758,12 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
  	}
- 	if (!(flags & XMIT_SAME_MODE))
+ 	if (!(xflags & XMIT_SAME_MODE))
  		mode = from_wire_mode(read_int(f));
 -
  	if (chmod_modes && !S_ISLNK(mode))
  		mode = tweak_mode(mode, chmod_modes);
 +#ifdef SUPPORT_FLAGS
-+ 	if (preserve_fileflags && !(flags & XMIT_SAME_FLAGS))
++	if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS))
 +		fileflags = (uint32)read_int(f);
 +#endif
  
- 	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
+ 	if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
  		if (protocol_version < 30)
-@@ -846,6 +866,10 @@ static struct file_struct *recv_file_ent
+@@ -865,6 +885,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
  		OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32);
  	}
  	file->mode = mode;
 +#ifdef SUPPORT_FLAGS
-+	if (preserve_fileflags)
++	if (fileflags_ndx)
 +		F_FFLAGS(file) = fileflags;
 +#endif
- 	if (preserve_uid)
+ 	if (uid_ndx)
  		F_OWNER(file) = uid;
- 	if (preserve_gid)
-@@ -1159,6 +1183,10 @@ struct file_struct *make_file(const char
+ 	if (gid_ndx) {
+@@ -1193,6 +1217,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
  		OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32);
  	}
  	file->mode = st.st_mode;
 +#ifdef SUPPORT_FLAGS
-+	if (preserve_fileflags)
++	if (fileflags_ndx)
 +		F_FFLAGS(file) = st.st_flags;
 +#endif
- 	if (preserve_uid)
+ 	if (uid_ndx)
  		F_OWNER(file) = st.st_uid;
- 	if (preserve_gid)
---- old/generator.c
-+++ new/generator.c
-@@ -115,6 +115,14 @@ static int dir_tweaking;
- static int need_retouch_dir_times;
+ 	if (gid_ndx)
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -112,6 +112,14 @@ static int need_retouch_dir_times;
+ static int need_retouch_dir_perms;
  static const char *solo_file = NULL;
  
 +#ifdef SUPPORT_FLAGS
@@ -139,7 +158,7 @@ TODO: fix --delete-delay to work with --flags option.
  /* For calling delete_item() and delete_dir_contents(). */
  #define DEL_RECURSE		(1<<1) /* recurse */
  #define DEL_DIR_IS_EMPTY	(1<<2) /* internal delete_FUNCTIONS use only */
-@@ -130,7 +138,6 @@ enum delret {
+@@ -127,7 +135,6 @@ enum delret {
  /* Forward declaration for delete_item(). */
  static enum delret delete_dir_contents(char *fname, int flags);
  
@@ -147,7 +166,7 @@ TODO: fix --delete-delay to work with --flags option.
  static int is_backup_file(char *fn)
  {
  	int k = strlen(fn) - backup_suffix_len;
-@@ -143,17 +150,20 @@ static int is_backup_file(char *fn)
+@@ -140,17 +147,20 @@ static int is_backup_file(char *fn)
   * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's
   * a directory! (The buffer is used for recursion, but returned unchanged.)
   */
@@ -171,7 +190,7 @@ TODO: fix --delete-delay to work with --flags option.
  	if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
  		ignore_perishable = 1;
  		/* If DEL_RECURSE is not set, this just reports emptiness. */
-@@ -265,7 +275,7 @@ static enum delret delete_dir_contents(c
+@@ -262,7 +272,7 @@ static enum delret delete_dir_contents(char *fname, int flags)
  		if (S_ISDIR(fp->mode)
  		 && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
  			ret = DR_NOT_EMPTY;
@@ -180,8 +199,8 @@ TODO: fix --delete-delay to work with --flags option.
  			ret = DR_NOT_EMPTY;
  	}
  
-@@ -321,8 +331,9 @@ static int remember_delete(struct file_s
- 	
+@@ -318,8 +328,9 @@ static int remember_delete(struct file_struct *file, const char *fname)
+ 
  	while (1) {
  		len = snprintf(deldelay_buf + deldelay_cnt,
 -			       deldelay_size - deldelay_cnt,
@@ -192,7 +211,7 @@ TODO: fix --delete-delay to work with --flags option.
  		if ((deldelay_cnt += len) <= deldelay_size)
  			break;
  		if (deldelay_fd < 0 && !start_delete_delay_temp())
-@@ -335,7 +346,7 @@ static int remember_delete(struct file_s
+@@ -332,7 +343,7 @@ static int remember_delete(struct file_struct *file, const char *fname)
  	return 1;
  }
  
@@ -201,7 +220,7 @@ TODO: fix --delete-delay to work with --flags option.
  {
  	static int read_pos = 0;
  	int j, len, mode;
-@@ -377,7 +388,7 @@ static int read_delay_line(char *buf)
+@@ -374,12 +385,12 @@ static int read_delay_line(char *buf)
  
  	bp = deldelay_buf + read_pos;
  
@@ -210,7 +229,13 @@ TODO: fix --delete-delay to work with --flags option.
  	  invalid_data:
  		rprintf(FERROR, "ERROR: invalid data in delete-delay file.\n");
  		return -1;
-@@ -400,15 +411,15 @@ static int read_delay_line(char *buf)
+ 	}
+-	past_space = strchr(bp, ' ') + 1;
++	past_space = strchr(strchr(bp, ' ') + 1, ' ') + 1;
+ 	len = j - read_pos - (past_space - bp) + 1; /* count the '\0' */
+ 	read_pos = j + 1;
+ 
+@@ -397,15 +408,15 @@ static int read_delay_line(char *buf)
  
  static void do_delayed_deletions(char *delbuf)
  {
@@ -229,7 +254,7 @@ TODO: fix --delete-delay to work with --flags option.
  	if (deldelay_fd >= 0)
  		close(deldelay_fd);
  }
-@@ -475,7 +486,7 @@ static void delete_in_dir(char *fbuf, st
+@@ -472,7 +483,7 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
  				if (!remember_delete(fp, delbuf))
  					break;
  			} else
@@ -238,16 +263,25 @@ TODO: fix --delete-delay to work with --flags option.
  		}
  	}
  
-@@ -1213,7 +1224,7 @@ static void recv_generator(char *fname, 
+@@ -1294,7 +1305,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+ 			 * full later (right before we handle its contents). */
+ 			if (statret == 0
+ 			 && (S_ISDIR(sx.st.st_mode)
+-			  || delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0))
++			  || delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), "directory", del_opts) != 0))
+ 				goto cleanup; /* Any errors get reported later. */
+ 			if (do_mkdir(fname, file->mode & 0700) == 0)
+ 				file->flags |= FLAG_DIR_CREATED;
+@@ -1306,7 +1317,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
  		 * we need to delete it.  If it doesn't exist, then
  		 * (perhaps recursively) create it. */
  		if (statret == 0 && !S_ISDIR(sx.st.st_mode)) {
 -			if (delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0)
 +			if (delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), "directory", del_opts) != 0)
- 				return;
+ 				goto skipping_dir_contents;
  			statret = -1;
  		}
-@@ -1326,7 +1337,7 @@ static void recv_generator(char *fname, 
+@@ -1435,7 +1446,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
  			}
  			/* Not the right symlink (or not a symlink), so
  			 * delete it. */
@@ -256,7 +290,7 @@ TODO: fix --delete-delay to work with --flags option.
  				goto cleanup;
  		} else if (basis_dir[0] != NULL) {
  			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
-@@ -1403,7 +1414,7 @@ static void recv_generator(char *fname, 
+@@ -1514,7 +1525,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
  					goto return_with_success;
  				goto cleanup;
  			}
@@ -265,7 +299,7 @@ TODO: fix --delete-delay to work with --flags option.
  				goto cleanup;
  		} else if (basis_dir[0] != NULL) {
  			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
-@@ -1492,7 +1503,7 @@ static void recv_generator(char *fname, 
+@@ -1605,7 +1616,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
  	fnamecmp_type = FNAMECMP_FNAME;
  
  	if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
@@ -274,9 +308,10 @@ TODO: fix --delete-delay to work with --flags option.
  			goto cleanup;
  		statret = -1;
  		stat_errno = ENOENT;
---- old/options.c
-+++ new/options.c
-@@ -49,6 +49,7 @@ int preserve_hard_links = 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -52,6 +52,7 @@ int preserve_hard_links = 0;
  int preserve_acls = 0;
  int preserve_xattrs = 0;
  int preserve_perms = 0;
@@ -284,15 +319,15 @@ TODO: fix --delete-delay to work with --flags option.
  int preserve_executability = 0;
  int preserve_devices = 0;
  int preserve_specials = 0;
-@@ -212,6 +213,7 @@ static void print_rsync_version(enum log
+@@ -223,6 +224,7 @@ static void print_rsync_version(enum logcode f)
  	char const *links = "no ";
  	char const *iconv = "no ";
  	char const *ipv6 = "no ";
-+ 	char const *fileflags = "no ";
++	char const *fileflags = "no ";
  	STRUCT_STAT *dumstat;
  
  #if SUBPROTOCOL_VERSION != 0
-@@ -241,6 +243,9 @@ static void print_rsync_version(enum log
+@@ -252,6 +254,9 @@ static void print_rsync_version(enum logcode f)
  #ifdef ICONV_OPTION
  	iconv = "";
  #endif
@@ -302,7 +337,7 @@ TODO: fix --delete-delay to work with --flags option.
  
  	rprintf(f, "%s  version %s  protocol version %d%s\n",
  		RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
-@@ -254,8 +259,8 @@ static void print_rsync_version(enum log
+@@ -265,8 +270,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);
@@ -313,7 +348,7 @@ TODO: fix --delete-delay to work with --flags option.
  
  #ifdef MAINTAINER_MODE
  	rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
-@@ -321,6 +326,7 @@ void usage(enum logcode F)
+@@ -333,6 +338,7 @@ 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");
@@ -321,7 +356,7 @@ TODO: fix --delete-delay to work with --flags option.
    rprintf(F," -E, --executability         preserve the file's executability\n");
    rprintf(F,"     --chmod=CHMOD           affect file and/or directory permissions\n");
  #ifdef SUPPORT_ACLS
-@@ -458,6 +464,8 @@ static struct poptOption long_options[] 
+@@ -473,6 +479,8 @@ 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 },
@@ -330,7 +365,7 @@ TODO: fix --delete-delay to work with --flags option.
    {"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 },
-@@ -1236,6 +1244,15 @@ int parse_arguments(int *argc, const cha
+@@ -1289,6 +1297,15 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
  	}
  #endif
  
@@ -346,7 +381,7 @@ TODO: fix --delete-delay to work with --flags option.
  	if (write_batch && read_batch) {
  		snprintf(err_buf, sizeof err_buf,
  			"--write-batch and --read-batch can not be used together\n");
-@@ -1712,6 +1729,9 @@ void server_options(char **args,int *arg
+@@ -1803,6 +1820,9 @@ void server_options(char **args, int *argc_p)
  	if (xfer_dirs && !recurse && delete_mode && am_sender)
  		args[ac++] = "--no-r";
  
@@ -356,19 +391,20 @@ TODO: fix --delete-delay to work with --flags option.
  	if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) {
  		if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0)
  			goto oom;
---- old/rsync.c
-+++ new/rsync.c
-@@ -31,6 +31,7 @@ extern int dry_run;
+diff --git a/rsync.c b/rsync.c
+--- a/rsync.c
++++ b/rsync.c
+@@ -32,6 +32,7 @@ extern int dry_run;
  extern int preserve_acls;
  extern int preserve_xattrs;
  extern int preserve_perms;
 +extern int preserve_fileflags;
  extern int preserve_executability;
  extern int preserve_times;
- extern int omit_dir_times;
-@@ -61,6 +62,16 @@ iconv_t ic_send = (iconv_t)-1, ic_recv =
- int ic_ndx;
- #endif
+ extern int am_root;
+@@ -60,6 +61,16 @@ iconv_t ic_chck = (iconv_t)-1;
+ iconv_t ic_send = (iconv_t)-1, ic_recv = (iconv_t)-1;
+ # endif
  
 +#ifdef SUPPORT_FLAGS
 +#ifndef UF_NOUNLINK
@@ -382,8 +418,8 @@ TODO: fix --delete-delay to work with --flags option.
 +
  static const char *default_charset(void)
  {
- #if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
-@@ -265,6 +276,41 @@ mode_t dest_mode(mode_t flist_mode, mode
+ # if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
+@@ -338,6 +349,41 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
  	return new_mode;
  }
  
@@ -392,7 +428,7 @@ TODO: fix --delete-delay to work with --flags option.
 +static int set_fileflags(const char *fname, uint32 fileflags)
 +{
 +	if (do_chflags(fname, fileflags) != 0) {
-+		rsyserr(FERROR, errno,
++		rsyserr(FERROR_XFER, errno,
 +			"failed to set file flags on %s",
 +			full_fname(fname));
 +		return 0;
@@ -402,7 +438,7 @@ TODO: fix --delete-delay to work with --flags option.
 +}
 +
 +/* Remove immutable flags from an object, so it can be altered/removed. */
-+void make_mutable(char *fname, mode_t mode, uint32 fileflags)
++void make_mutable(const char *fname, mode_t mode, uint32 fileflags)
 +{
 +	if (!preserve_fileflags && S_ISLNK(mode))
 +		return;
@@ -412,7 +448,7 @@ TODO: fix --delete-delay to work with --flags option.
 +}
 +
 +/* Undo a prior make_mutable() call. */
-+void undo_make_mutable(char *fname, mode_t mode, uint32 fileflags)
++void undo_make_mutable(const char *fname, mode_t mode, uint32 fileflags)
 +{
 +	if (!preserve_fileflags && S_ISLNK(mode))
 +		return;
@@ -422,10 +458,10 @@ TODO: fix --delete-delay to work with --flags option.
 +}
 +#endif
 +
- int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
+ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
  		   const char *fnamecmp, int flags)
  {
-@@ -395,6 +441,15 @@ int set_file_attrs(const char *fname, st
+@@ -469,6 +515,15 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
  	}
  #endif
  
@@ -441,7 +477,7 @@ TODO: fix --delete-delay to work with --flags option.
  	if (verbose > 1 && flags & ATTRS_REPORT) {
  		if (updated)
  			rprintf(FCLIENT, "%s\n", fname);
-@@ -454,6 +509,9 @@ void finish_transfer(const char *fname, 
+@@ -530,6 +585,9 @@ int finish_transfer(const char *fname, const char *fnametmp,
  	set_file_attrs(fnametmp, file, NULL, fnamecmp,
  		       ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
  
@@ -451,27 +487,28 @@ TODO: fix --delete-delay to work with --flags option.
  	/* move tmp file over real file */
  	if (verbose > 2)
  		rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
-@@ -468,6 +526,9 @@ void finish_transfer(const char *fname, 
+@@ -547,6 +605,9 @@ int finish_transfer(const char *fname, const char *fnametmp,
  	}
  	if (ret == 0) {
  		/* The file was moved into place (not copied), so it's done. */
 +#ifdef SUPPORT_FLAGS
 +		undo_make_mutable(fname, file->mode, F_FFLAGS(file));
 +#endif
- 		return;
+ 		return 1;
  	}
  	/* The file was copied, so tweak the perms of the copied file.  If it
---- old/rsync.h
-+++ new/rsync.h
-@@ -56,6 +56,7 @@
+diff --git a/rsync.h b/rsync.h
+--- a/rsync.h
++++ b/rsync.h
+@@ -60,6 +60,7 @@
  #define XMIT_RDEV_MINOR_8_pre30 (1<<11)	/* protocols 28 - 29  */
- #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - NOW */
- #define XMIT_HLINK_FIRST (1<<12)	/* protocols 30 - NOW */
-+#define XMIT_SAME_FLAGS (1<<14)		/* protocols ?? - NOW */
+ #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */
+ #define XMIT_HLINK_FIRST (1<<12)	/* protocols 30 - now (HLINKED files only) */
++#define XMIT_SAME_FLAGS (1<<14)		/* protocols ?? - now */
  
  /* These flags are used in the live flist data. */
  
-@@ -403,6 +404,10 @@ enum msgcode {
+@@ -451,6 +452,10 @@ typedef unsigned int size_t;
  #endif
  #endif
  
@@ -482,25 +519,26 @@ TODO: fix --delete-delay to work with --flags option.
  /* 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. */
-@@ -582,6 +587,7 @@ struct file_struct {
- extern int file_extra_cnt;
- extern int preserve_uid;
- extern int preserve_gid;
-+extern int preserve_fileflags;
- extern int preserve_acls;
- extern int preserve_xattrs;
+@@ -618,6 +623,7 @@ extern int file_extra_cnt;
+ extern int inc_recurse;
+ extern int uid_ndx;
+ extern int gid_ndx;
++extern int fileflags_ndx;
+ extern int acls_ndx;
+ extern int xattrs_ndx;
  
-@@ -616,6 +622,7 @@ extern int preserve_xattrs;
+@@ -655,6 +661,7 @@ extern int xattrs_ndx;
  /* When the associated option is on, all entries will have these present: */
- #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
- #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
-+#define F_FFLAGS(f) REQ_EXTRA(f, preserve_fileflags)->unum
- #define F_ACL(f) REQ_EXTRA(f, preserve_acls)->num
- #define F_XATTR(f) REQ_EXTRA(f, preserve_xattrs)->num
- #define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -321,6 +321,7 @@ to the detailed description below for a 
+ #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
+ #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum
++#define F_FFLAGS(f) REQ_EXTRA(f, fileflags_ndx)->unum
+ #define F_ACL(f) REQ_EXTRA(f, acls_ndx)->num
+ #define F_XATTR(f) REQ_EXTRA(f, xattrs_ndx)->num
+ #define F_NDX(f) REQ_EXTRA(f, unsort_ndx)->num
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -338,6 +338,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
@@ -508,7 +546,7 @@ TODO: fix --delete-delay to work with --flags option.
   -E, --executability         preserve executability
       --chmod=CHMOD           affect file and/or directory permissions
   -A, --acls                  preserve ACLs (implies -p)
-@@ -520,7 +521,9 @@ specified, in which case bf(-r) is not i
+@@ -540,7 +541,9 @@ 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
@@ -519,9 +557,9 @@ TODO: fix --delete-delay to work with --flags option.
  
  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-":
-@@ -845,6 +848,13 @@ extended attributes to be the same as th
- only if the remote machine's rsync supports this option also. This is
- a non-standard option.
+@@ -909,6 +912,13 @@ super-user copies all namespaces except system.*.  A normal user only copies
+ the user.* namespace.  To be able to backup and restore non-user namespaces as
+ a normal user, see the bf(--fake-super) option.
  
 +dit(bf(--flags)) This option causes rsync to update the change file flags
 +to be the same as the source file, if your OS supports the bf(chflags)(2)
@@ -533,9 +571,10 @@ TODO: fix --delete-delay to work with --flags option.
  dit(bf(--chmod)) This option tells rsync to apply one or more
  comma-separated "chmod" strings to the permission of the files in the
  transfer.  The resulting value is treated as though it was the permissions
---- old/syscall.c
-+++ new/syscall.c
-@@ -162,6 +162,15 @@ int do_chmod(const char *path, mode_t mo
+diff --git a/syscall.c b/syscall.c
+--- a/syscall.c
++++ b/syscall.c
+@@ -173,6 +173,15 @@ int do_chmod(const char *path, mode_t mode)
  }
  #endif