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:
55175a2
)
Fixed a failing hunk.
author
Wayne Davison
<wayned@samba.org>
Mon, 15 Oct 2007 00:17:58 +0000
(
00:17
+0000)
committer
Wayne Davison
<wayned@samba.org>
Mon, 15 Oct 2007 00:17:58 +0000
(
00:17
+0000)
atimes.diff
patch
|
blob
|
blame
|
history
diff --git
a/atimes.diff
b/atimes.diff
index
f9ef446
..
ffd79ca
100644
(file)
--- a/
atimes.diff
+++ b/
atimes.diff
@@
-53,7
+53,7
@@
TODO: need to fix this to handle 64-bit time_t values!
static mode_t mode;
static int64 dev;
static dev_t rdev;
static mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -43
2,6 +434
,13 @@ static void send_file_entry(int f, struc
+@@ -43
8,6 +440
,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) {
-@@ -5
05,6 +514
,8 @@ static void send_file_entry(int f, struc
+@@ -5
11,6 +520
,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,7
+76,7
@@
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
1,7 +602
,7 @@ static void send_file_entry(int f, struc
+@@ -59
7,7 +608
,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 struct file_struct *recv_file_entry(struct file_list *flist,
int xflags, int f)
{
@@
-85,7
+85,7
@@
TODO: need to fix this to handle 64-bit time_t values!
static mode_t mode;
static int64 dev;
static dev_t rdev;
static mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -72
2,6 +733
,16 @@ static struct file_struct *recv_file_ent
+@@ -72
8,6 +739
,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);
-@@ -85
0,6 +871
,8 @@ static struct file_struct *recv_file_ent
+@@ -85
6,6 +877
,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;
-@@ -11
72,6 +119
5,8 @@ struct file_struct *make_file(const char
+@@ -11
82,6 +120
5,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;
@@
-137,10
+137,10
@@
TODO: need to fix this to handle 64-bit time_t values!
+ if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
+ && cmp_time(F_ATIME(file), sxp->st.st_atime) != 0)
+ iflags |= ITEM_REPORT_ATIME;
+ if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
+ && cmp_time(F_ATIME(file), sxp->st.st_atime) != 0)
+ iflags |= ITEM_REPORT_ATIME;
- if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
- iflags |= ITEM_REPORT_PERMS;
- if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
-@@ -8
79,6 +883
,8 @@ static int try_dests_reg(struct file_str
+ #ifndef HAVE_LCHMOD
+ if (S_ISLNK(file->mode)) {
+ ;
+@@ -8
84,6 +888
,8 @@ static int try_dests_reg(struct file_str
if (link_dest) {
if (!hard_link_one(file, fname, cmpbuf, 1))
goto try_a_copy;
if (link_dest) {
if (!hard_link_one(file, fname, cmpbuf, 1))
goto try_a_copy;
@@
-149,7
+149,7
@@
TODO: need to fix this to handle 64-bit time_t values!
if (preserve_hard_links && F_IS_HLINKED(file))
finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j);
if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
if (preserve_hard_links && F_IS_HLINKED(file))
finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j);
if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
-@@ -10
75,6 +1081
,7 @@ static int try_dests_non(struct file_str
+@@ -10
80,6 +1086
,7 @@ static int try_dests_non(struct file_str
static void list_file_entry(struct file_struct *f)
{
char permbuf[PERMSTRING_SIZE];
static void list_file_entry(struct file_struct *f)
{
char permbuf[PERMSTRING_SIZE];
@@
-157,7
+157,7
@@
TODO: need to fix this to handle 64-bit time_t values!
double len;
if (!F_IS_ACTIVE(f)) {
double len;
if (!F_IS_ACTIVE(f)) {
-@@ -10
89,14 +1096
,16 @@ static void list_file_entry(struct file_
+@@ -10
94,14 +1101
,16 @@ static void list_file_entry(struct file_
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
@@
-176,7
+176,7
@@
TODO: need to fix this to handle 64-bit time_t values!
f_name(f, NULL));
}
}
f_name(f, NULL));
}
}
-@@ -18
46,7 +1855
,7 @@ static void touch_up_dirs(struct file_li
+@@ -18
51,7 +1860
,7 @@ static void touch_up_dirs(struct file_li
if (!(file->mode & S_IWUSR))
do_chmod(fname, file->mode);
if (need_retouch_dir_times)
if (!(file->mode & S_IWUSR))
do_chmod(fname, file->mode);
if (need_retouch_dir_times)
@@
-302,7
+302,7
@@
TODO: need to fix this to handle 64-bit time_t values!
/* These flags are used in the live flist data. */
/* These flags are used in the live flist data. */
-@@ -14
4,6 +145
,7 @@
+@@ -14
5,6 +146
,7 @@
#define ATTRS_REPORT (1<<0)
#define ATTRS_SKIP_MTIME (1<<1)
#define ATTRS_REPORT (1<<0)
#define ATTRS_SKIP_MTIME (1<<1)
@@
-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
-@@ -58
2,6 +584
,7 @@ extern int file_extra_cnt;
+@@ -58
6,6 +588
,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
19,6 +622
,7 @@ extern int xattrs_ndx;
+@@ -6
23,6 +626
,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
@@
-328,7
+328,7
@@
TODO: need to fix this to handle 64-bit time_t values!
#define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num
--- old/rsync.yo
+++ new/rsync.yo
#define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num
--- old/rsync.yo
+++ new/rsync.yo
-@@ -3
50,6 +350
,7 @@ to the detailed description below for a
+@@ -3
49,6 +349
,7 @@ to the detailed description below for a
-D same as --devices --specials
-t, --times preserve modification times
-O, --omit-dir-times omit directories from --times
-D same as --devices --specials
-t, --times preserve modification times
-O, --omit-dir-times omit directories from --times
@@
-336,7
+336,7
@@
TODO: need to fix this to handle 64-bit time_t values!
--super receiver attempts super-user activities
--fake-super store/recover privileged attrs using xattrs
-S, --sparse handle sparse files efficiently
--super receiver attempts super-user activities
--fake-super store/recover privileged attrs using xattrs
-S, --sparse handle sparse files efficiently
-@@ -96
0,6 +961
,12 @@ it is preserving modification times (see
+@@ -96
5,6 +966
,12 @@ it is preserving modification times (see
the directories on the receiving side, it is a good idea to use bf(-O).
This option is inferred if you use bf(--backup) without bf(--backup-dir).
the directories on the receiving side, it is a good idea to use bf(-O).
This option is inferred if you use bf(--backup) without bf(--backup-dir).
@@
-349,7
+349,7
@@
TODO: need to fix this to handle 64-bit time_t values!
dit(bf(--super)) This tells the receiving side to attempt super-user
activities even if the receiving rsync wasn't run by the super-user. These
activities include: preserving users via the bf(--owner) option, preserving
dit(bf(--super)) This tells the receiving side to attempt super-user
activities even if the receiving rsync wasn't run by the super-user. These
activities include: preserving users via the bf(--owner) option, preserving
-@@ -164
1,8 +1648
,10 @@ quote(itemization(
+@@ -164
6,8 +1653
,10 @@ quote(itemization(
sender's value (requires bf(--owner) and super-user privileges).
it() A bf(g) means the group is different and is being updated to the
sender's value (requires bf(--group) and the authority to set the group).
sender's value (requires bf(--owner) and super-user privileges).
it() A bf(g) means the group is different and is being updated to the
sender's value (requires bf(--group) and the authority to set the group).