--- old/compat.c
+++ new/compat.c
-@@ -94,6 +94,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -95,6 +95,8 @@ void setup_protocol(int f_out,int f_in)
preserve_uid = ++file_extra_cnt;
if (preserve_gid)
preserve_gid = ++file_extra_cnt;
if (preserve_xattrs)
--- old/flist.c
+++ new/flist.c
-@@ -51,6 +51,7 @@ extern int preserve_devices;
+@@ -52,6 +52,7 @@ extern int preserve_devices;
extern int preserve_specials;
extern int preserve_uid;
extern int preserve_gid;
extern int relative_paths;
extern int implied_dirs;
extern int file_extra_cnt;
-@@ -154,6 +155,7 @@ void show_flist_stats(void)
+@@ -158,6 +159,7 @@ void show_flist_stats(void)
static void list_file_entry(struct file_struct *f)
{
char permbuf[PERMSTRING_SIZE];
double len;
if (!F_IS_ACTIVE(f)) {
-@@ -168,14 +170,16 @@ static void list_file_entry(struct file_
+@@ -172,14 +174,16 @@ static void list_file_entry(struct file_
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
f_name(f, NULL));
}
}
-@@ -344,6 +348,7 @@ int push_pathname(const char *dir, int l
+@@ -338,6 +342,7 @@ int push_pathname(const char *dir, int l
static void send_file_entry(int f, struct file_struct *file, int ndx)
{
static time_t modtime;
static mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -439,6 +444,13 @@ static void send_file_entry(int f, struc
+@@ -433,6 +438,13 @@ static void send_file_entry(int f, struc
flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
#ifdef SUPPORT_HARD_LINKS
if (tmp_dev != 0) {
-@@ -510,6 +522,8 @@ static void send_file_entry(int f, struc
+@@ -504,6 +516,8 @@ static void send_file_entry(int f, struc
}
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
if (protocol_version < 30)
write_int(f, uid);
-@@ -596,7 +610,7 @@ static void send_file_entry(int f, struc
+@@ -590,7 +604,7 @@ static void send_file_entry(int f, struc
static struct file_struct *recv_file_entry(struct file_list *flist,
int xflags, int f)
{
static mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -731,6 +745,16 @@ static struct file_struct *recv_file_ent
+@@ -726,6 +740,16 @@ static struct file_struct *recv_file_ent
}
if (!(xflags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
if (chmod_modes && !S_ISLNK(mode))
mode = tweak_mode(mode, chmod_modes);
-@@ -859,6 +883,8 @@ static struct file_struct *recv_file_ent
+@@ -854,6 +878,8 @@ static struct file_struct *recv_file_ent
F_GROUP(file) = gid;
file->flags |= gid_flags;
}
#ifdef ICONV_OPTION
if (ic_ndx)
F_NDX(file) = flist->count + flist->ndx_start;
-@@ -1172,6 +1198,8 @@ struct file_struct *make_file(const char
+@@ -1173,6 +1199,8 @@ struct file_struct *make_file(const char
F_OWNER(file) = st.st_uid;
if (preserve_gid)
F_GROUP(file) = st.st_gid;
if (preserve_hard_links && F_IS_HLINKED(file))
finish_hard_link(file, fname, &sxp->st, itemizing, code, j);
if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
-@@ -1743,7 +1749,7 @@ static void touch_up_dirs(struct file_li
+@@ -1749,7 +1755,7 @@ static void touch_up_dirs(struct file_li
if (!(file->mode & S_IWUSR))
do_chmod(fname, file->mode);
if (need_retouch_dir_times)
- set_modtime(fname, file->modtime, file->mode);
+ set_times(fname, file->modtime, file->modtime, file->mode);
- if (allowed_lull && !(++j % lull_mod))
+ if (allowed_lull && !(counter % lull_mod))
maybe_send_keepalive();
- else if (!(j % 200))
+ else if (!(counter & 0xFF))
--- old/log.c
+++ new/log.c
@@ -34,6 +34,7 @@ extern int msg_fd_out;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -334,8 +335,9 @@ void usage(enum logcode F)
+@@ -335,8 +336,9 @@ void usage(enum logcode F)
rprintf(F," --devices preserve device files (super-user only)\n");
rprintf(F," --specials preserve special files\n");
rprintf(F," -D same as --devices --specials\n");
rprintf(F," --super receiver attempts super-user activities\n");
#ifdef SUPPORT_XATTRS
rprintf(F," --fake-super store/recover privileged attrs using xattrs\n");
-@@ -468,6 +470,9 @@ static struct poptOption long_options[]
+@@ -471,6 +473,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 },
{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
{"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
{"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
-@@ -1652,6 +1657,8 @@ void server_options(char **args,int *arg
+@@ -1668,6 +1673,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
extern int preserve_times;
extern int omit_dir_times;
extern int am_root;
-@@ -271,6 +272,7 @@ int set_file_attrs(const char *fname, st
+@@ -275,6 +276,7 @@ int set_file_attrs(const char *fname, st
int updated = 0;
statx sx2;
int change_uid, change_gid;
mode_t new_mode = file->mode;
if (!sxp) {
-@@ -308,18 +310,36 @@ int set_file_attrs(const char *fname, st
+@@ -312,18 +314,36 @@ int set_file_attrs(const char *fname, st
set_stat_xattr(fname, file);
#endif