Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5bf6d6c
)
Got rid of patch fuzz.
author
Wayne Davison
<wayned@samba.org>
Sat, 27 Oct 2007 05:08:37 +0000
(
05:08
+0000)
committer
Wayne Davison
<wayned@samba.org>
Sat, 27 Oct 2007 05:08:37 +0000
(
05:08
+0000)
atimes.diff
patch
|
blob
|
blame
|
history
diff --git
a/atimes.diff
b/atimes.diff
index
20489e6
..
29a54be
100644
(file)
--- a/
atimes.diff
+++ b/
atimes.diff
@@
-26,7
+26,7
@@
TODO: need to fix this to handle 64-bit time_t values!
#ifdef ICONV_OPTION
int ic_ndx;
#ifdef ICONV_OPTION
int ic_ndx;
-@@ -12
2,6 +123
,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -12
5,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;
uid_ndx = ++file_extra_cnt;
if (preserve_gid)
gid_ndx = ++file_extra_cnt;
@@
-51,9
+51,9
@@
TODO: need to fix this to handle 64-bit time_t values!
static time_t modtime;
+ static time_t atime;
static mode_t mode;
static time_t modtime;
+ static time_t atime;
static mode_t mode;
+ #ifdef SUPPORT_HARD_LINKS
static int64 dev;
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;
xflags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
@@
-67,7
+67,7
@@
TODO: need to fix this to handle 64-bit time_t values!
#ifdef SUPPORT_HARD_LINKS
if (tmp_dev != 0) {
#ifdef SUPPORT_HARD_LINKS
if (tmp_dev != 0) {
-@@ -51
1,6 +520
,8 @@ static void send_file_entry(int f, struc
+@@ -51
3,6 +522
,8 @@ static void send_file_entry(int f, struc
}
if (!(xflags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
}
if (!(xflags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
@@
-76,16
+76,16
@@
TODO: need to fix this to handle 64-bit time_t values!
if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
if (protocol_version < 30)
write_int(f, uid);
if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
if (protocol_version < 30)
write_int(f, uid);
-@@ -59
7,7 +608
,7 @@ static void send_file_entry(int f, struc
+@@ -59
9,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;
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 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 (!(xflags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
@@
-102,7
+102,7
@@
TODO: need to fix this to handle 64-bit time_t values!
if (chmod_modes && !S_ISLNK(mode))
mode = tweak_mode(mode, chmod_modes);
if (chmod_modes && !S_ISLNK(mode))
mode = tweak_mode(mode, chmod_modes);
-@@ -8
56,6 +877
,8 @@ static struct file_struct *recv_file_ent
+@@ -8
60,6 +881
,8 @@ static struct file_struct *recv_file_ent
F_GROUP(file) = gid;
file->flags |= gid_flags;
}
F_GROUP(file) = gid;
file->flags |= gid_flags;
}
@@
-111,7
+111,7
@@
TODO: need to fix this to handle 64-bit time_t values!
#ifdef ICONV_OPTION
if (ic_ndx)
F_NDX(file) = flist->used + flist->ndx_start;
#ifdef ICONV_OPTION
if (ic_ndx)
F_NDX(file) = flist->used + flist->ndx_start;
-@@ -118
2,6 +1205
,8 @@ struct file_struct *make_file(const char
+@@ -118
6,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;
F_OWNER(file) = st.st_uid;
if (gid_ndx)
F_GROUP(file) = st.st_gid;
@@
-244,7
+244,7
@@
TODO: need to fix this to handle 64-bit time_t values!
extern int preserve_times;
extern int am_root;
extern int am_server;
extern int preserve_times;
extern int am_root;
extern int am_server;
-@@ -34
3,6 +344
,7 @@ int set_file_attrs(const char *fname, st
+@@ -34
0,6 +341
,7 @@ int set_file_attrs(const char *fname, st
int updated = 0;
stat_x sx2;
int change_uid, change_gid;
int updated = 0;
stat_x sx2;
int change_uid, change_gid;
@@
-252,7
+252,7
@@
TODO: need to fix this to handle 64-bit time_t values!
mode_t new_mode = file->mode;
int inherit;
mode_t new_mode = file->mode;
int inherit;
-@@ -38
3,18 +385
,36 @@ int set_file_attrs(const char *fname, st
+@@ -38
0,18 +382
,36 @@ int set_file_attrs(const char *fname, st
set_stat_xattr(fname, file);
#endif
set_stat_xattr(fname, file);
#endif
@@
-310,7
+310,7
@@
TODO: need to fix this to handle 64-bit time_t values!
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
#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 inc_recurse;
extern int uid_ndx;
extern int gid_ndx;
@@
-318,7
+318,7
@@
TODO: need to fix this to handle 64-bit time_t values!
extern int acls_ndx;
extern int xattrs_ndx;
extern int acls_ndx;
extern int xattrs_ndx;
-@@ -6
23,6 +626
,7 @@ extern int xattrs_ndx;
+@@ -6
39,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
/* 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