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. */
#ifdef ICONV_OPTION
int ic_ndx;
-@@ -115,6 +116,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -112,6 +113,8 @@ void setup_protocol(int f_out,int f_in)
uid_ndx = ++file_extra_cnt;
if (preserve_gid)
gid_ndx = ++file_extra_cnt;
extern int uid_ndx;
extern int gid_ndx;
extern int eol_nulls;
-@@ -364,6 +365,9 @@ static void send_file_entry(int f, struc
+@@ -335,6 +336,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;
-@@ -411,6 +415,12 @@ static void send_file_entry(int f, struc
+@@ -382,6 +386,12 @@ static void send_file_entry(int f, struc
xflags |= XMIT_SAME_MODE;
else
mode = file->mode;
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
+@@ -505,6 +515,10 @@ static void send_file_entry(int f, struc
}
if (!(xflags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
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
+@@ -593,6 +607,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;
-@@ -751,9 +768,12 @@ static struct file_struct *recv_file_ent
+@@ -722,9 +739,12 @@ static struct file_struct *recv_file_ent
}
if (!(xflags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
if (protocol_version < 30)
-@@ -873,6 +893,10 @@ static struct file_struct *recv_file_ent
+@@ -844,6 +864,10 @@ static struct file_struct *recv_file_ent
OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32);
}
file->mode = mode;
if (uid_ndx)
F_OWNER(file) = uid;
if (gid_ndx) {
-@@ -1192,6 +1216,10 @@ struct file_struct *make_file(const char
+@@ -1168,6 +1192,10 @@ struct file_struct *make_file(const char
OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32);
}
file->mode = st.st_mode;
}
}
-@@ -1233,7 +1244,7 @@ static void recv_generator(char *fname,
+@@ -1270,7 +1281,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)) {
goto skipping_dir_contents;
statret = -1;
}
-@@ -1362,7 +1373,7 @@ static void recv_generator(char *fname,
+@@ -1399,7 +1410,7 @@ static void recv_generator(char *fname,
}
/* Not the right symlink (or not a symlink), so
* delete it. */
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,
+@@ -1478,7 +1489,7 @@ static void recv_generator(char *fname,
goto return_with_success;
goto cleanup;
}
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,
+@@ -1569,7 +1580,7 @@ static void recv_generator(char *fname,
fnamecmp_type = FNAMECMP_FNAME;
if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
stat_errno = ENOENT;
--- old/options.c
+++ new/options.c
-@@ -50,6 +50,7 @@ int preserve_hard_links = 0;
+@@ -51,6 +51,7 @@ int preserve_hard_links = 0;
int preserve_acls = 0;
int preserve_xattrs = 0;
int preserve_perms = 0;
int preserve_executability = 0;
int preserve_devices = 0;
int preserve_specials = 0;
-@@ -220,6 +221,7 @@ static void print_rsync_version(enum log
+@@ -221,6 +222,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
-@@ -249,6 +251,9 @@ static void print_rsync_version(enum log
+@@ -250,6 +252,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);
-@@ -262,8 +267,8 @@ static void print_rsync_version(enum log
+@@ -263,8 +268,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());
-@@ -330,6 +335,7 @@ void usage(enum logcode F)
+@@ -331,6 +336,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");
{"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
+@@ -1285,6 +1293,15 @@ int parse_arguments(int *argc_p, const c
}
#endif
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
+@@ -1796,6 +1813,9 @@ void server_options(char **args, int *ar
if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
goto oom;
--- old/rsync.c
+++ new/rsync.c
-@@ -31,6 +31,7 @@ extern int dry_run;
+@@ -32,6 +32,7 @@ extern int dry_run;
extern int preserve_acls;
extern int preserve_xattrs;
extern int preserve_perms;
extern int preserve_executability;
extern int preserve_times;
extern int am_root;
-@@ -59,6 +60,16 @@ iconv_t ic_chck = (iconv_t)-1;
+@@ -60,6 +61,16 @@ iconv_t ic_chck = (iconv_t)-1;
iconv_t ic_send = (iconv_t)-1, ic_recv = (iconv_t)-1;
# 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
+@@ -337,6 +348,41 @@ mode_t dest_mode(mode_t flist_mode, mode
return new_mode;
}
+}
+#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
+@@ -468,6 +514,15 @@ int set_file_attrs(const char *fname, st
}
#endif
if (verbose > 1 && flags & ATTRS_REPORT) {
if (updated)
rprintf(FCLIENT, "%s\n", fname);
-@@ -526,6 +581,9 @@ void finish_transfer(const char *fname,
+@@ -527,6 +582,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);
-@@ -540,6 +598,9 @@ void finish_transfer(const char *fname,
+@@ -541,6 +599,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. */
-@@ -406,6 +407,10 @@ enum msgcode {
+@@ -415,6 +416,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. */
-@@ -573,6 +578,7 @@ extern int file_extra_cnt;
+@@ -582,6 +587,7 @@ extern int file_extra_cnt;
extern int inc_recurse;
extern int uid_ndx;
extern int gid_ndx;
extern int acls_ndx;
extern int xattrs_ndx;
-@@ -610,6 +616,7 @@ extern int xattrs_ndx;
+@@ -619,6 +625,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
-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
+@@ -544,7 +545,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-":
-@@ -883,6 +886,13 @@ dit(bf(-X, --xattrs)) This option causes
+@@ -891,6 +894,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.