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
My version of Matt's --trust-rename patch.
[rsync/rsync-patches.git]
/
atimes.diff
diff --git
a/atimes.diff
b/atimes.diff
index
173e3e9
..
f9ef446
100644
(file)
--- a/
atimes.diff
+++ b/
atimes.diff
@@
-246,7
+246,7
@@
TODO: need to fix this to handle 64-bit time_t values!
extern int am_server;
@@ -343,6 +344,7 @@ int set_file_attrs(const char *fname, st
int updated = 0;
extern int am_server;
@@ -343,6 +344,7 @@ int set_file_attrs(const char *fname, st
int updated = 0;
- statx sx2;
+ stat
_
x sx2;
int change_uid, change_gid;
+ time_t atime, mtime;
mode_t new_mode = file->mode;
int change_uid, change_gid;
+ time_t atime, mtime;
mode_t new_mode = file->mode;
@@
-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
-@@ -5
79,6 +581
,7 @@ extern int file_extra_cnt;
+@@ -5
82,6 +584
,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;
-@@ -61
6,6 +619
,7 @@ extern int xattrs_ndx;
+@@ -61
9,6 +622
,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
-@@ -35
4,6 +354
,7 @@ to the detailed description below for a
+@@ -35
0,6 +350
,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
-@@ -9
56,6 +957
,12 @@ it is preserving modification times (see
+@@ -9
60,6 +961
,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
-@@ -16
33,8 +1640
,10 @@ quote(itemization(
+@@ -16
41,8 +1648
,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).
@@
-495,7
+495,7
@@
TODO: need to fix this to handle 64-bit time_t values!
+ printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
(long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
- datebuf, fname, linkbuf);
+ printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
(long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
- datebuf, fname, linkbuf);
-+ mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "",
++ mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "",
+ fname, linkbuf);
}
+ fname, linkbuf);
}