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
Updated patches to work with the current trunk.
[rsync/rsync-patches.git]
/
crtimes.diff
diff --git
a/crtimes.diff
b/crtimes.diff
index
72afa70
..
439020f
100644
(file)
--- a/
crtimes.diff
+++ b/
crtimes.diff
@@
-8,11
+8,11
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on: patch/fileflags
+based-on: patch/
master/
fileflags
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
-@@ -4
4,6 +44
,7 @@ extern int force_change;
+@@ -4
5,6 +45
,7 @@ extern int force_change;
extern int protect_args;
extern int preserve_uid;
extern int preserve_gid;
extern int protect_args;
extern int preserve_uid;
extern int preserve_gid;
@@
-20,7
+20,7
@@
diff --git a/compat.c b/compat.c
extern int preserve_fileflags;
extern int preserve_acls;
extern int preserve_xattrs;
extern int preserve_fileflags;
extern int preserve_acls;
extern int preserve_xattrs;
-@@ -6
2,7 +63
,7 @@ extern char *iconv_opt;
+@@ -6
3,7 +64
,7 @@ extern char *iconv_opt;
#endif
/* These index values are for the file-list's extra-attribute array. */
#endif
/* These index values are for the file-list's extra-attribute array. */
@@
-29,7
+29,7
@@
diff --git a/compat.c b/compat.c
int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
int sender_symlink_iconv = 0; /* sender should convert symlink content */
int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
int sender_symlink_iconv = 0; /* sender should convert symlink content */
-@@ -1
38,6 +139
,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -1
40,6 +141
,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;
@@
-41,7
+41,7
@@
diff --git a/compat.c b/compat.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -5
5,6 +55
,7 @@ extern int missing_args;
+@@ -5
6,6 +56
,7 @@ extern int missing_args;
extern int uid_ndx;
extern int gid_ndx;
extern int eol_nulls;
extern int uid_ndx;
extern int gid_ndx;
extern int eol_nulls;
@@
-49,7
+49,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;
-@@ -40
5,7 +406
,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -40
7,7 +408
,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
#endif
int ndx, int first_ndx)
{
#endif
int ndx, int first_ndx)
{
@@
-58,7
+58,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;
-@@ -51
6,6 +517
,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -51
8,6 +519
,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
modtime = file->modtime;
if (NSEC_BUMP(file) && protocol_version >= 31)
xflags |= XMIT_MOD_NSEC;
modtime = file->modtime;
if (NSEC_BUMP(file) && protocol_version >= 31)
xflags |= XMIT_MOD_NSEC;
@@
-72,7
+72,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) {
-@@ -60
0,6 +608
,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -60
2,6 +610
,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
}
if (xflags & XMIT_MOD_NSEC)
write_varint(f, F_MOD_NSEC(file));
}
if (xflags & XMIT_MOD_NSEC)
write_varint(f, F_MOD_NSEC(file));
@@
-81,7
+81,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
-@@ -69
1,7 +701
,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -69
3,7 +703
,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags)
{
static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags)
{
@@
-90,7
+90,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;
-@@ -83
6,6 +846
,19 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -83
8,6 +848
,19 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
modtime_nsec = read_varint(f);
else
modtime_nsec = 0;
modtime_nsec = read_varint(f);
else
modtime_nsec = 0;
@@
-110,7
+110,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));
-@@ -100
6,6 +1029
,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -100
8,6 +1031
,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
F_GROUP(file) = gid;
file->flags |= gid_flags;
}
F_GROUP(file) = gid;
file->flags |= gid_flags;
}
@@
-119,7
+119,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;
-@@ -140
5,6 +1430
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -140
7,6 +1432
,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;
@@
-139,7
+139,7
@@
diff --git a/generator.c b/generator.c
extern int preserve_hard_links;
extern int preserve_executability;
extern int preserve_fileflags;
extern int preserve_hard_links;
extern int preserve_executability;
extern int preserve_fileflags;
-@@ -41
9,6 +420
,13 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
+@@ -41
8,6 +419
,13 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
return 0;
if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
return 0;
@@
-153,7
+153,7
@@
diff --git a/generator.c b/generator.c
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
if (!ACL_READY(*sxp))
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
if (!ACL_READY(*sxp))
-@@ -46
2,6 +470
,12 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -46
1,6 +469
,12 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
: iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED)
&& (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
iflags |= ITEM_REPORT_TIME;
: iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED)
&& (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
iflags |= ITEM_REPORT_TIME;
@@
-166,7
+166,7
@@
diff --git a/generator.c b/generator.c
#if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
if (S_ISLNK(file->mode)) {
;
#if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
if (S_ISLNK(file->mode)) {
;
-@@ -102
9,6 +1043
,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
+@@ -102
8,6 +1042
,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
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];
@@
-174,7
+174,7
@@
diff --git a/generator.c b/generator.c
int64 len;
int colwidth = human_readable ? 14 : 11;
int64 len;
int colwidth = human_readable ? 14 : 11;
-@@ -104
4,10 +1059
,11 @@ static void list_file_entry(struct file_struct *f)
+@@ -104
3,10 +1058
,11 @@ static void list_file_entry(struct file_struct *f)
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
@@
-189,7
+189,7
@@
diff --git a/generator.c b/generator.c
} else
#endif
if (missing_args == 2 && f->mode == 0) {
} else
#endif
if (missing_args == 2 && f->mode == 0) {
-@@ -105
5,9 +1071
,11 @@ static void list_file_entry(struct file_struct *f)
+@@ -105
4,9 +1070
,11 @@ static void list_file_entry(struct file_struct *f)
colwidth + 31, "*missing",
f_name(f, NULL));
} else {
colwidth + 31, "*missing",
f_name(f, NULL));
} else {
@@
-203,7
+203,7
@@
diff --git a/generator.c b/generator.c
}
}
}
}
-@@ -114
8,6 +1166
,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -114
7,6 +1165
,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
return;
}
}
return;
}
}
@@
-285,7
+285,7
@@
diff --git a/options.c b/options.c
{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
{"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
{"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
{"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
{"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
-@@ -23
52,6 +2357
,8 @@ void server_options(char **args, int *argc_p)
+@@ -23
67,6 +2372
,8 @@ void server_options(char **args, int *argc_p)
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
@@
-405,7
+405,7
@@
diff --git a/rsync.yo b/rsync.yo
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
-@@ -19
04,7 +1908
,7 @@ with older versions of rsync, but that also turns on the output of other
+@@ -19
18,7 +1922
,7 @@ with older versions of rsync, but that also turns on the output of other
verbose messages).
The "%i" escape has a cryptic output that is 11 letters long. The general
verbose messages).
The "%i" escape has a cryptic output that is 11 letters long. The general
@@
-414,7
+414,7
@@
diff --git a/rsync.yo b/rsync.yo
type of update being done, bf(X) is replaced by the file-type, and the
other letters represent attributes that may be output if they are being
modified.
type of update being done, bf(X) is replaced by the file-type, and the
other letters represent attributes that may be output if they are being
modified.
-@@ -19
63,6 +1967
,8 @@ quote(itemization(
+@@ -19
77,6 +1981
,8 @@ quote(itemization(
it() The bf(f) means that the fileflags information changed.
it() The bf(a) means that the ACL information changed.
it() The bf(x) means that the extended attribute information changed.
it() The bf(f) means that the fileflags information changed.
it() The bf(a) means that the ACL information changed.
it() The bf(x) means that the extended attribute information changed.
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff