--- old/compat.c
+++ new/compat.c
-@@ -94,6 +94,8 @@ void setup_protocol(int f_out,int f_in)
- preserve_uid = ++file_extra_cnt;
+@@ -43,6 +43,7 @@ extern int prune_empty_dirs;
+ extern int protocol_version;
+ extern int preserve_uid;
+ extern int preserve_gid;
++extern int preserve_fileflags;
+ extern int preserve_acls;
+ extern int preserve_xattrs;
+ extern int preserve_hard_links;
+@@ -57,7 +58,7 @@ extern char *dest_option;
+ extern struct filter_list_struct filter_list;
+
+ /* 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;
+
+ /* The server makes sure that if either side only supports a pre-release
+ * version of a protocol, that both sides must speak a compatible version
+@@ -98,6 +99,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
AC_CHECK_FUNCS(getpgrp tcgetpgrp)
--- old/flist.c
+++ new/flist.c
-@@ -49,6 +49,7 @@ extern int preserve_links;
- extern int preserve_hard_links;
- extern int preserve_devices;
+@@ -52,6 +52,7 @@ extern int preserve_devices;
extern int preserve_specials;
-+extern int preserve_fileflags;
- extern int preserve_uid;
- extern int preserve_gid;
+ extern int uid_ndx;
+ extern int gid_ndx;
++extern int fileflags_ndx;
extern int relative_paths;
-@@ -345,6 +346,9 @@ static void send_file_entry(int f, struc
+ extern int implied_dirs;
+ extern int file_extra_cnt;
+@@ -348,6 +349,9 @@ static void send_file_entry(int f, struc
{
static time_t modtime;
static mode_t mode;
static int64 dev;
static dev_t rdev;
static uint32 rdev_major;
-@@ -393,6 +397,12 @@ static void send_file_entry(int f, struc
+@@ -396,6 +400,12 @@ static void send_file_entry(int f, struc
flags |= XMIT_SAME_MODE;
else
mode = file->mode;
if ((preserve_devices && IS_DEVICE(mode))
|| (preserve_specials && IS_SPECIAL(mode))) {
if (protocol_version < 28) {
-@@ -510,6 +520,10 @@ static void send_file_entry(int f, struc
+@@ -513,6 +523,10 @@ static void send_file_entry(int f, struc
}
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
+#ifdef SUPPORT_FLAGS
-+ if (preserve_fileflags && !(flags & XMIT_SAME_FLAGS))
++ if (fileflags_ndx && !(flags & XMIT_SAME_FLAGS))
+ write_int(f, (int)fileflags);
+#endif
- if (preserve_uid && !(flags & XMIT_SAME_UID)) {
+ if (uid_ndx && !(flags & XMIT_SAME_UID)) {
if (protocol_version < 30)
write_int(f, uid);
-@@ -598,6 +612,9 @@ static struct file_struct *recv_file_ent
+@@ -601,6 +615,9 @@ static struct file_struct *recv_file_ent
{
static int64 modtime;
static mode_t mode;
static int64 dev;
static dev_t rdev;
static uint32 rdev_major;
-@@ -730,9 +747,12 @@ static struct file_struct *recv_file_ent
+@@ -735,9 +752,12 @@ static struct file_struct *recv_file_ent
}
- 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)
-@@ -851,6 +871,10 @@ static struct file_struct *recv_file_ent
+@@ -857,6 +877,10 @@ static struct file_struct *recv_file_ent
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)
-@@ -1164,6 +1188,10 @@ struct file_struct *make_file(const char
+ if (gid_ndx) {
+@@ -1178,6 +1202,10 @@ struct file_struct *make_file(const char
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)
+ if (gid_ndx)
--- old/generator.c
+++ new/generator.c
@@ -115,6 +115,14 @@ static int dir_tweaking;
int preserve_executability = 0;
int preserve_devices = 0;
int preserve_specials = 0;
-@@ -212,6 +213,7 @@ static void print_rsync_version(enum log
+@@ -213,6 +214,7 @@ static void print_rsync_version(enum log
char const *links = "no ";
char const *iconv = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
#if SUBPROTOCOL_VERSION != 0
-@@ -241,6 +243,9 @@ static void print_rsync_version(enum log
+@@ -242,6 +244,9 @@ static void print_rsync_version(enum log
#ifdef ICONV_OPTION
iconv = "";
#endif
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
+@@ -255,8 +260,8 @@ static void print_rsync_version(enum log
(int)(sizeof (int64) * 8));
rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
got_socketpair, hardlinks, links, ipv6, have_inplace);
#ifdef MAINTAINER_MODE
rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
-@@ -321,6 +326,7 @@ void usage(enum logcode F)
+@@ -322,6 +327,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");
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[]
+@@ -461,6 +467,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 },
{"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
+@@ -1252,6 +1260,15 @@ int parse_arguments(int *argc, const cha
}
#endif
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
+@@ -1731,6 +1748,9 @@ void server_options(char **args,int *arg
if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
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
+@@ -269,6 +280,41 @@ mode_t dest_mode(mode_t flist_mode, mode
return new_mode;
}
int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
const char *fnamecmp, int flags)
{
-@@ -395,6 +441,15 @@ int set_file_attrs(const char *fname, st
+@@ -397,6 +443,15 @@ int set_file_attrs(const char *fname, st
}
#endif
if (verbose > 1 && flags & ATTRS_REPORT) {
if (updated)
rprintf(FCLIENT, "%s\n", fname);
-@@ -454,6 +509,9 @@ void finish_transfer(const char *fname,
+@@ -456,6 +511,9 @@ void finish_transfer(const char *fname,
set_file_attrs(fnametmp, file, NULL, fnamecmp,
ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
/* 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,
+@@ -470,6 +528,9 @@ void finish_transfer(const char *fname,
}
if (ret == 0) {
/* The file was moved into place (not copied), so it's done. */
/* These flags are used in the live flist data. */
-@@ -404,6 +405,10 @@ enum msgcode {
+@@ -405,6 +406,10 @@ enum msgcode {
#endif
#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. */
-@@ -583,6 +588,7 @@ struct file_struct {
+@@ -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;
+ extern int uid_ndx;
+ extern int gid_ndx;
++extern int fileflags_ndx;
+ extern int acls_ndx;
+ extern int xattrs_ndx;
-@@ -617,6 +623,7 @@ extern int preserve_xattrs;
+@@ -616,6 +622,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_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
-@@ -321,6 +321,7 @@ to the detailed description below for a
+@@ -327,6 +327,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
-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
+@@ -526,7 +527,9 @@ specified, in which case bf(-r) is not i
Note that bf(-a) bf(does not preserve hardlinks), because
finding multiply-linked files is expensive. You must separately
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
+@@ -851,6 +854,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.