#ifdef ICONV_OPTION
int ic_ndx;
-@@ -122,6 +123,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -125,6 +126,8 @@ void setup_protocol(int f_out,int f_in)
uid_ndx = ++file_extra_cnt;
if (preserve_gid)
gid_ndx = ++file_extra_cnt;
static time_t modtime;
+ static time_t atime;
static mode_t mode;
+ #ifdef SUPPORT_HARD_LINKS
static int64 dev;
- static dev_t rdev;
-@@ -438,6 +440,13 @@ static void send_file_entry(int f, struc
+@@ -440,6 +442,13 @@ static void send_file_entry(int f, struc
xflags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
#ifdef SUPPORT_HARD_LINKS
if (tmp_dev != 0) {
-@@ -511,6 +520,8 @@ static void send_file_entry(int f, struc
+@@ -513,6 +522,8 @@ 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);
-@@ -597,7 +608,7 @@ static void send_file_entry(int f, struc
+@@ -599,7 +610,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 int64 modtime;
+ static int64 modtime, atime;
static mode_t mode;
+ #ifdef SUPPORT_HARD_LINKS
static int64 dev;
- static dev_t rdev;
-@@ -728,6 +739,16 @@ static struct file_struct *recv_file_ent
+@@ -732,6 +743,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);
-@@ -856,6 +877,8 @@ static struct file_struct *recv_file_ent
+@@ -860,6 +881,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->used + flist->ndx_start;
-@@ -1182,6 +1205,8 @@ struct file_struct *make_file(const char
+@@ -1186,6 +1209,8 @@ struct file_struct *make_file(const char
F_OWNER(file) = st.st_uid;
if (gid_ndx)
F_GROUP(file) = st.st_gid;
extern int preserve_times;
extern int am_root;
extern int am_server;
-@@ -343,6 +344,7 @@ int set_file_attrs(const char *fname, st
+@@ -340,6 +341,7 @@ int set_file_attrs(const char *fname, st
int updated = 0;
stat_x sx2;
int change_uid, change_gid;
mode_t new_mode = file->mode;
int inherit;
-@@ -383,18 +385,36 @@ int set_file_attrs(const char *fname, st
+@@ -380,18 +382,36 @@ int set_file_attrs(const char *fname, st
set_stat_xattr(fname, file);
#endif
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
-@@ -586,6 +588,7 @@ extern int file_extra_cnt;
+@@ -602,6 +604,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;
-@@ -623,6 +626,7 @@ extern int xattrs_ndx;
+@@ -639,6 +642,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