X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/ccdb48f6739a9fb3893983b993210ec23891ebb2..a5e6228afbf1809d33d9a31e0895c5e955c39ce1:/flags.diff

diff --git a/flags.diff b/flags.diff
index 80ac3d7..ea30598 100644
--- a/flags.diff
+++ b/flags.diff
@@ -1,4 +1,4 @@
-This patch provides --flags, which preserves the st_flags field.
+This patch provides --fileflags, which preserves the st_flags stat() field.
 Modified from a patch that was written by Rolf Grossmann.
 
 To use this patch, run these commands for a successful build:
@@ -8,10 +8,9 @@ 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
+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;
@@ -20,16 +19,16 @@ TODO: fix --delete-delay to work with --flags option.
  extern int preserve_acls;
  extern int preserve_xattrs;
  extern int need_messages_from_generator;
-@@ -63,7 +64,7 @@ extern iconv_t ic_send, ic_recv;
+@@ -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;
-+int uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx;
- #ifdef ICONV_OPTION
- int ic_ndx;
+-int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
++int uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
  
-@@ -115,6 +116,8 @@ void setup_protocol(int f_out,int f_in)
+ #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)
  		gid_ndx = ++file_extra_cnt;
@@ -38,19 +37,21 @@ TODO: fix --delete-delay to work with --flags option.
  	if (preserve_acls && !am_sender)
  		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 getxattr \
 +    chflags strerror putenv iconv_open locale_charset nl_langinfo getxattr \
-     extattr_get_link sigaction sigprocmask)
+     extattr_get_link sigaction sigprocmask setattrlist)
  
- AC_CHECK_FUNCS(getpgrp tcgetpgrp)
---- old/flist.c
-+++ new/flist.c
+ 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;
@@ -59,65 +60,64 @@ TODO: fix --delete-delay to work with --flags option.
  extern int uid_ndx;
  extern int gid_ndx;
  extern int eol_nulls;
-@@ -364,6 +365,9 @@ static void send_file_entry(int f, struc
+@@ -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;
-@@ -411,6 +415,12 @@ static void send_file_entry(int f, struc
+ #endif
+@@ -403,6 +407,14 @@ 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)
-+		xflags |= XMIT_SAME_FLAGS;
-+	else
-+		fileflags = F_FFLAGS(file);
++	if (fileflags_ndx) {
++		if (F_FFLAGS(file) == fileflags)
++			xflags |= XMIT_SAME_FLAGS;
++		else
++			fileflags = F_FFLAGS(file);
++	}
 +#endif
  
- 	if (protocol_version >= 30 && S_ISDIR(mode) && !(file->flags & FLAG_XFER_DIR))
- 		xflags |= XMIT_NON_XFER_DIR;
-@@ -534,6 +544,10 @@ static void send_file_entry(int f, struc
+ 	if ((preserve_devices && IS_DEVICE(mode))
+ 	 || (preserve_specials && IS_SPECIAL(mode))) {
+@@ -522,6 +534,10 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_
  	}
  	if (!(xflags & XMIT_SAME_MODE))
  		write_int(f, to_wire_mode(mode));
 +#ifdef SUPPORT_FLAGS
-+ 	if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS))
++	if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS))
 +		write_int(f, (int)fileflags);
 +#endif
  	if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
  		if (protocol_version < 30)
  			write_int(f, uid);
-@@ -622,6 +636,9 @@ static struct file_struct *recv_file_ent
+@@ -610,6 +626,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;
-@@ -751,9 +768,12 @@ static struct file_struct *recv_file_ent
- 	}
- 	if (!(xflags & XMIT_SAME_MODE))
- 		mode = from_wire_mode(read_int(f));
--
+ #endif
+@@ -744,6 +763,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+ 
  	if (chmod_modes && !S_ISLNK(mode))
  		mode = tweak_mode(mode, chmod_modes);
 +#ifdef SUPPORT_FLAGS
-+ 	if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS))
++	if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS))
 +		fileflags = (uint32)read_int(f);
 +#endif
  
  	if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
  		if (protocol_version < 30)
-@@ -873,6 +893,10 @@ static struct file_struct *recv_file_ent
+@@ -865,6 +888,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
  		OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32);
  	}
  	file->mode = mode;
@@ -128,7 +128,7 @@ TODO: fix --delete-delay to work with --flags option.
  	if (uid_ndx)
  		F_OWNER(file) = uid;
  	if (gid_ndx) {
-@@ -1192,6 +1216,10 @@ struct file_struct *make_file(const char
+@@ -1199,6 +1226,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;
@@ -139,161 +139,145 @@ TODO: fix --delete-delay to work with --flags option.
  	if (uid_ndx)
  		F_OWNER(file) = st.st_uid;
  	if (gid_ndx)
---- old/generator.c
-+++ new/generator.c
-@@ -114,6 +114,14 @@ static int need_retouch_dir_times;
- static int need_retouch_dir_perms;
- static const char *solo_file = NULL;
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -122,6 +122,7 @@ static const char *solo_file = NULL;
+ #define DEL_FOR_SYMLINK 	(1<<5) /* making room for a replacement symlink */
+ #define DEL_FOR_DEVICE		(1<<6) /* making room for a replacement device */
+ #define DEL_FOR_SPECIAL 	(1<<7) /* making room for a replacement special */
++#define DEL_AN_IMMUTABLE	(1<<8) /* item has an immutable flag set */
  
-+#ifdef SUPPORT_FLAGS
-+#define FF_PTR(p) F_FFLAGS(p)
-+#define FF_STAT(s) s.st_flags
-+#else
-+#define FF_PTR(p) 0
-+#define FF_STAT(s) 0
-+#endif
-+
- /* 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 */
-@@ -129,7 +137,6 @@ enum delret {
- /* Forward declaration for delete_item(). */
- static enum delret delete_dir_contents(char *fname, int flags);
- 
--
- static int is_backup_file(char *fn)
- {
- 	int k = strlen(fn) - backup_suffix_len;
-@@ -142,17 +149,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.)
-  */
--static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
-+static enum delret delete_item(char *fbuf, int mode, uint32 fileflags, char *replace, int flags)
- {
- 	enum delret ret;
- 	char *what;
- 	int ok;
- 
- 	if (verbose > 2) {
--		rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n",
--			fbuf, mode, flags);
-+		rprintf(FINFO, "delete_item(%s) mode=%o fileflags=%o flags=%d\n",
-+			fbuf, mode, fileflags, flags);
- 	}
+ #define DEL_MAKE_ROOM (DEL_FOR_FILE|DEL_FOR_DIR|DEL_FOR_SYMLINK|DEL_FOR_DEVICE|DEL_FOR_SPECIAL)
+ 
+@@ -161,6 +162,10 @@ static enum delret delete_item(char *fbuf, int mode, int flags)
  
+ 	if (!am_root && !(mode & S_IWUSR) && flags & DEL_OWNED_BY_US)
+ 		do_chmod(fbuf, mode |= S_IWUSR);
 +#ifdef SUPPORT_FLAGS
-+	make_mutable(fbuf, mode, fileflags);
++	if (fileflags_ndx && flags & DEL_AN_IMMUTABLE)
++		make_mutable(fbuf, mode, NODELETE_FLAGS);
 +#endif
+ 
  	if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
  		ignore_perishable = 1;
- 		/* If DEL_RECURSE is not set, this just reports emptiness. */
-@@ -264,7 +274,7 @@ static enum delret delete_dir_contents(c
- 		if (S_ISDIR(fp->mode)
- 		 && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
- 			ret = DR_NOT_EMPTY;
--		if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
-+		if (delete_item(fname, fp->mode, FF_PTR(fp), NULL, flags) != DR_SUCCESS)
- 			ret = DR_NOT_EMPTY;
- 	}
+@@ -282,6 +287,14 @@ static enum delret delete_dir_contents(char *fname, int flags)
+ 			flags |= DEL_OWNED_BY_US;
+ 		else
+ 			flags &= ~DEL_OWNED_BY_US;
++#ifdef SUPPORT_FLAGS
++		if (fileflags_ndx) {
++			if (F_FFLAGS(fp) & NODELETE_FLAGS)
++				flags |= DEL_AN_IMMUTABLE;
++			else
++				flags &= ~DEL_AN_IMMUTABLE;
++		}
++#endif 
+ 		/* Save stack by recursing to ourself directly. */
+ 		if (S_ISDIR(fp->mode)) {
+ 			if (!am_root && !(fp->mode & S_IWUSR) && flags & DEL_OWNED_BY_US)
+@@ -341,15 +354,22 @@ static int flush_delete_delay(void)
+ 
+ static int remember_delete(struct file_struct *file, const char *fname, int flags)
+ {
+-	const char *plus = (!am_root && !(file->mode & S_IWUSR) && flags & DEL_OWNED_BY_US)
+-			 ? "+" : "";
++	char buf[16], *bp = buf;
+ 	int len;
  
-@@ -320,8 +330,9 @@ static int remember_delete(struct file_s
- 	
++	if (!am_root && !(file->mode & S_IWUSR) && flags & DEL_OWNED_BY_US)
++		*bp++ = '+';
++#ifdef SUPPORT_FLAGS
++	if (flags & DEL_AN_IMMUTABLE)
++		*bp++ = '-';
++#endif
++	*bp = '\0';
++
  	while (1) {
  		len = snprintf(deldelay_buf + deldelay_cnt,
--			       deldelay_size - deldelay_cnt,
--			       "%x %s%c", (int)file->mode, fname, '\0');
-+			       deldelay_size - deldelay_cnt, "%x %x %s%c",
-+			       (int)file->mode, (int)FF_PTR(file),
-+			       fname, '\0');
+ 			       deldelay_size - deldelay_cnt,
+ 			       "%s%x %s%c",
+-			       plus, (int)file->mode, fname, '\0');
++			       buf, (int)file->mode, fname, '\0');
  		if ((deldelay_cnt += len) <= deldelay_size)
  			break;
  		if (deldelay_fd < 0 && !start_delete_delay_temp())
-@@ -334,7 +345,7 @@ static int remember_delete(struct file_s
+@@ -362,10 +382,10 @@ static int remember_delete(struct file_struct *file, const char *fname, int flag
  	return 1;
  }
  
--static int read_delay_line(char *buf)
-+static int read_delay_line(char *buf, int *fileflags_p)
+-static int read_delay_line(char *buf, int *own_flag_p)
++static int read_delay_line(char *buf, int *flags_p)
  {
  	static int read_pos = 0;
- 	int j, len, mode;
-@@ -376,7 +387,7 @@ static int read_delay_line(char *buf)
+-	int j, len, mode;
++	int j, len, mode, flags = 0;
+ 	char *bp, *past_space;
  
+ 	while (1) {
+@@ -405,9 +425,15 @@ static int read_delay_line(char *buf, int *own_flag_p)
  	bp = deldelay_buf + read_pos;
+ 	if (*bp == '+') {
+ 		bp++;
+-		*own_flag_p = DEL_OWNED_BY_US;
+-	} else
+-		*own_flag_p = 0;
++		flags |= DEL_OWNED_BY_US;
++	}
++#ifdef SUPPORT_FLAGS
++	if (*bp == '-') {
++		bp++;
++		flags |= DEL_AN_IMMUTABLE;
++	}
++#endif
++	*flags_p = flags;
  
--	if (sscanf(bp, "%x ", &mode) != 1) {
-+	if (sscanf(bp, "%x %x ", &mode, fileflags_p) != 2) {
+ 	if (sscanf(bp, "%x ", &mode) != 1) {
  	  invalid_data:
- 		rprintf(FERROR, "ERROR: invalid data in delete-delay file.\n");
- 		return -1;
-@@ -399,15 +410,15 @@ static int read_delay_line(char *buf)
+@@ -432,15 +458,15 @@ static int read_delay_line(char *buf, int *own_flag_p)
  
  static void do_delayed_deletions(char *delbuf)
  {
--	int mode;
-+	int mode, fileflags;
+-	int mode, own_flag;
++	int mode, flags;
  
  	if (deldelay_fd >= 0) {
  		if (deldelay_cnt && !flush_delete_delay())
  			return;
  		lseek(deldelay_fd, 0, 0);
  	}
--	while ((mode = read_delay_line(delbuf)) >= 0)
--		delete_item(delbuf, mode, NULL, DEL_RECURSE);
-+	while ((mode = read_delay_line(delbuf, &fileflags)) >= 0)
-+		delete_item(delbuf, mode, fileflags, NULL, DEL_RECURSE);
+-	while ((mode = read_delay_line(delbuf, &own_flag)) >= 0)
+-		delete_item(delbuf, mode, own_flag | DEL_RECURSE);
++	while ((mode = read_delay_line(delbuf, &flags)) >= 0)
++		delete_item(delbuf, mode, DEL_RECURSE | flags);
  	if (deldelay_fd >= 0)
  		close(deldelay_fd);
  }
-@@ -474,7 +485,7 @@ static void delete_in_dir(char *fbuf, st
- 				if (!remember_delete(fp, delbuf))
- 					break;
- 			} else
--				delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
-+				delete_item(delbuf, fp->mode, FF_PTR(fp), NULL, DEL_RECURSE);
+@@ -503,6 +529,9 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
  		}
- 	}
+ 		if (flist_find(cur_flist, fp) < 0) {
+ 			int flags = DEL_RECURSE
++#ifdef SUPPORT_FLAGS
++				  | (fileflags_ndx && F_FFLAGS(fp) & NODELETE_FLAGS ? DEL_AN_IMMUTABLE : 0)
++#endif
+ 				  | (!uid_ndx || (uid_t)F_OWNER(fp) == our_uid ? DEL_OWNED_BY_US : 0);
+ 			f_name(fp, delbuf);
+ 			if (delete_during == 2) {
+@@ -1316,6 +1345,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
  
-@@ -1233,7 +1244,7 @@ static void recv_generator(char *fname, 
- 		 * 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)
- 				goto skipping_dir_contents;
- 			statret = -1;
- 		}
-@@ -1362,7 +1373,7 @@ static void recv_generator(char *fname, 
- 			}
- 			/* Not the right symlink (or not a symlink), so
- 			 * delete it. */
--			if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0)
-+			if (delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), "symlink", del_opts) != 0)
- 				goto cleanup;
- 		} else if (basis_dir[0] != NULL) {
- 			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
-@@ -1441,7 +1452,7 @@ static void recv_generator(char *fname, 
- 					goto return_with_success;
- 				goto cleanup;
- 			}
--			if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0)
-+			if (delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), t, del_opts) != 0)
- 				goto cleanup;
- 		} else if (basis_dir[0] != NULL) {
- 			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
-@@ -1532,7 +1543,7 @@ static void recv_generator(char *fname, 
- 	fnamecmp_type = FNAMECMP_FNAME;
- 
- 	if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
--		if (delete_item(fname, sx.st.st_mode, "regular file", del_opts) != 0)
-+		if (delete_item(fname, sx.st.st_mode, FF_STAT(sx.st), "regular file", del_opts) != 0)
- 			goto cleanup;
- 		statret = -1;
- 		stat_errno = ENOENT;
---- old/options.c
-+++ new/options.c
-@@ -50,6 +50,7 @@ int preserve_hard_links = 0;
+ 	if (statret == 0 && sx.st.st_uid == our_uid)
+ 		del_opts |= DEL_OWNED_BY_US;
++#ifdef SUPPORT_FLAGS
++	if (statret == 0 && fileflags_ndx && sx.st.st_flags & NODELETE_FLAGS)
++		del_opts |= DEL_AN_IMMUTABLE;
++#endif
+ 
+ 	if (S_ISDIR(file->mode)) {
+ 		if (!implied_dirs && file->flags & FLAG_IMPLIED_DIR)
+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;
@@ -301,15 +285,15 @@ TODO: fix --delete-delay to work with --flags option.
  int preserve_executability = 0;
  int preserve_devices = 0;
  int preserve_specials = 0;
-@@ -220,6 +221,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
-@@ -249,6 +251,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
@@ -319,7 +303,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);
-@@ -262,8 +267,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);
@@ -330,7 +314,7 @@ TODO: fix --delete-delay to work with --flags option.
  
  #ifdef MAINTAINER_MODE
  	rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
-@@ -330,6 +335,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");
@@ -338,7 +322,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
-@@ -470,6 +476,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 },
@@ -347,14 +331,14 @@ 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 },
-@@ -1283,6 +1291,15 @@ int parse_arguments(int *argc_p, const c
+@@ -1289,6 +1297,15 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
  	}
  #endif
  
 +#ifndef SUPPORT_FLAGS
 +	if (preserve_fileflags) {
 +		snprintf(err_buf, sizeof err_buf,
-+			 "file flags are not supported on this %s\n",
++			 "the --fileflags option is not supported on this %s\n",
 +			 am_server ? "server" : "client");
 +		return 0;
 +	}
@@ -363,19 +347,20 @@ 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");
-@@ -1794,6 +1811,9 @@ void server_options(char **args, int *ar
+@@ -1804,6 +1821,9 @@ void server_options(char **args, int *argc_p)
  	if (xfer_dirs && !recurse && delete_mode && am_sender)
  		args[ac++] = "--no-r";
  
 +	if (preserve_fileflags)
-+		args[ac++] = "--flags";
++		args[ac++] = "--fileflags";
 +
  	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;
@@ -383,24 +368,7 @@ TODO: fix --delete-delay to work with --flags option.
  extern int preserve_executability;
  extern int preserve_times;
  extern int am_root;
-@@ -59,6 +60,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
-+#define UF_NOUNLINK 0
-+#endif
-+#ifndef SF_NOUNLINK
-+#define SF_NOUNLINK 0
-+#endif
-+#define NOCHANGE_FLAGS (UF_IMMUTABLE|UF_APPEND|UF_NOUNLINK|SF_IMMUTABLE|SF_APPEND|SF_NOUNLINK)
-+#endif
-+
- static const char *default_charset(void)
- {
- # if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
-@@ -336,6 +347,41 @@ mode_t dest_mode(mode_t flist_mode, mode
+@@ -338,6 +339,41 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
  	return new_mode;
  }
  
@@ -409,7 +377,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;
@@ -419,9 +387,9 @@ 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))
++	if (S_ISLNK(mode))
 +		return;
 +
 +	if (fileflags & NOCHANGE_FLAGS)
@@ -429,9 +397,9 @@ 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))
++	if (S_ISLNK(mode))
 +		return;
 +
 +	if (fileflags & NOCHANGE_FLAGS)
@@ -439,10 +407,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)
  {
-@@ -467,6 +513,15 @@ int set_file_attrs(const char *fname, st
+@@ -469,6 +505,15 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
  	}
  #endif
  
@@ -458,29 +426,32 @@ TODO: fix --delete-delay to work with --flags option.
  	if (verbose > 1 && flags & ATTRS_REPORT) {
  		if (updated)
  			rprintf(FCLIENT, "%s\n", fname);
-@@ -526,6 +581,9 @@ void finish_transfer(const char *fname, 
+@@ -530,6 +575,10 @@ int finish_transfer(const char *fname, const char *fnametmp,
  	set_file_attrs(fnametmp, file, NULL, fnamecmp,
  		       ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
  
 +#ifdef SUPPORT_FLAGS
-+	make_mutable(fnametmp, file->mode, F_FFLAGS(file));
++	if (preserve_fileflags)
++		make_mutable(fnametmp, file->mode, F_FFLAGS(file));
 +#endif
  	/* move tmp file over real file */
  	if (verbose > 2)
  		rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
-@@ -540,6 +598,9 @@ void finish_transfer(const char *fname, 
+@@ -547,6 +596,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. */
 +#ifdef SUPPORT_FLAGS
-+		undo_make_mutable(fname, file->mode, F_FFLAGS(file));
++		if (preserve_fileflags)
++			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
-@@ -57,6 +57,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 (HLINKED files only) */
@@ -488,18 +459,29 @@ TODO: fix --delete-delay to work with --flags option.
  
  /* These flags are used in the live flist data. */
  
-@@ -406,6 +407,10 @@ enum msgcode {
+@@ -451,6 +452,21 @@ typedef unsigned int size_t;
  #endif
  #endif
  
 +#ifdef HAVE_CHFLAGS
 +#define SUPPORT_FLAGS 1
 +#endif
++
++#ifdef SUPPORT_FLAGS
++#ifndef UF_NOUNLINK
++#define UF_NOUNLINK 0
++#endif
++#ifndef SF_NOUNLINK
++#define SF_NOUNLINK 0
++#endif
++#define NODELETE_FLAGS (UF_IMMUTABLE|UF_NOUNLINK|SF_IMMUTABLE|SF_NOUNLINK)
++#define NOCHANGE_FLAGS (NODELETE_FLAGS|UF_APPEND|SF_APPEND)
++#endif
 +
  /* 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. */
-@@ -573,6 +578,7 @@ extern int file_extra_cnt;
+@@ -619,6 +635,7 @@ extern int file_extra_cnt;
  extern int inc_recurse;
  extern int uid_ndx;
  extern int gid_ndx;
@@ -507,40 +489,40 @@ TODO: fix --delete-delay to work with --flags option.
  extern int acls_ndx;
  extern int xattrs_ndx;
  
-@@ -610,6 +616,7 @@ extern int xattrs_ndx;
+@@ -656,6 +673,7 @@ 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
 +#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, ic_ndx)->num
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -343,6 +343,7 @@ to the detailed description below for a 
+ #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
-+     --flags                 preserve file flags
++     --fileflags             preserve file-flags
   -E, --executability         preserve executability
       --chmod=CHMOD           affect file and/or directory permissions
   -A, --acls                  preserve ACLs (implies -p)
-@@ -543,7 +544,9 @@ specified, in which case bf(-r) is not i
+@@ -540,7 +541,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
 -specify bf(-H).
-+specify bf(-H).  Note also that for compatibility, bf(-a)
-+currently bf(does not include --flags) (see there) to include preserving
-+change file flags (if supported by the OS).
++specify bf(-H).  Note also that for backward compatibility, bf(-a)
++currently does bf(not) imply the bf(--fileflags) 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-":
-@@ -883,6 +886,13 @@ dit(bf(-X, --xattrs)) This option causes
- extended attributes to be the same as the local ones.  This will work
- only if the remote machine's rsync also supports this option.
+@@ -922,6 +924,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
++dit(bf(--fileflags)) This option causes rsync to update the file-flags
 +to be the same as the source file, if your OS supports the bf(chflags)(2)
 +system call.  In any case, an attempt is made to remove flags that would
 +prevent a file to be altered.  Some flags can only be altered by the
@@ -550,9 +532,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
+@@ -174,6 +174,15 @@ int do_chmod(const char *path, mode_t mode)
  }
  #endif