Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The patches for 3.0.1 and 3.0.2.
[rsync/rsync-patches.git]
/
crtimes.diff
diff --git
a/crtimes.diff
b/crtimes.diff
index
1d50bc9
..
c5b35dd
100644
(file)
--- a/
crtimes.diff
+++ b/
crtimes.diff
@@
-48,7
+48,7
@@
diff --git a/flist.c b/flist.c
extern int relative_paths;
extern int implied_dirs;
extern int file_extra_cnt;
extern int relative_paths;
extern int implied_dirs;
extern int file_extra_cnt;
-@@ -38
5,7 +386
,7 @@ int change_pathname(struct file_struct *file, const char *dir, int dirlen)
+@@ -38
9,7 +390
,7 @@ int change_pathname(struct file_struct *file, const char *dir, int dirlen)
static void send_file_entry(int f, const char *fname, struct file_struct *file, int ndx, int first_ndx)
{
static void send_file_entry(int f, const char *fname, struct file_struct *file, int ndx, int first_ndx)
{
@@
-57,7
+57,7
@@
diff --git a/flist.c b/flist.c
static mode_t mode;
#ifdef SUPPORT_FILEFLAGS
static uint32 fileflags;
static mode_t mode;
#ifdef SUPPORT_FILEFLAGS
static uint32 fileflags;
-@@ -47
0,6 +471
,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -47
4,6 +475
,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
xflags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
xflags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
@@
-71,7
+71,7
@@
diff --git a/flist.c b/flist.c
#ifdef SUPPORT_HARD_LINKS
if (tmp_dev != 0) {
#ifdef SUPPORT_HARD_LINKS
if (tmp_dev != 0) {
-@@ -5
39,6 +547
,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -5
43,6 +551
,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
else
write_int(f, modtime);
}
else
write_int(f, modtime);
}
@@
-80,7
+80,7
@@
diff --git a/flist.c b/flist.c
if (!(xflags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
#ifdef SUPPORT_FILEFLAGS
if (!(xflags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
#ifdef SUPPORT_FILEFLAGS
-@@ -63
1,7 +641
,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -63
5,7 +645
,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
static struct file_struct *recv_file_entry(struct file_list *flist,
int xflags, int f)
{
static struct file_struct *recv_file_entry(struct file_list *flist,
int xflags, int f)
{
@@
-89,7
+89,7
@@
diff --git a/flist.c b/flist.c
static mode_t mode;
#ifdef SUPPORT_FILEFLAGS
static uint32 fileflags;
static mode_t mode;
#ifdef SUPPORT_FILEFLAGS
static uint32 fileflags;
-@@ -7
66,6 +776
,19 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -7
70,6 +780
,19 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
} else
modtime = read_int(f);
}
} else
modtime = read_int(f);
}
@@
-109,7
+109,7
@@
diff --git a/flist.c b/flist.c
if (!(xflags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
if (!(xflags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
-@@ -90
5,6 +928
,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -90
9,6 +932
,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
F_GROUP(file) = gid;
file->flags |= gid_flags;
}
F_GROUP(file) = gid;
file->flags |= gid_flags;
}
@@
-118,7
+118,7
@@
diff --git a/flist.c b/flist.c
if (unsort_ndx)
F_NDX(file) = flist->used + flist->ndx_start;
if (unsort_ndx)
F_NDX(file) = flist->used + flist->ndx_start;
-@@ -12
57,6 +1282
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -12
61,6 +1286
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
F_OWNER(file) = st.st_uid;
if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */
F_GROUP(file) = st.st_gid;
F_OWNER(file) = st.st_uid;
if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */
F_GROUP(file) = st.st_gid;