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
Fixed failing hunks.
[rsync/rsync-patches.git]
/
early-checksum.diff
diff --git
a/early-checksum.diff
b/early-checksum.diff
index
3fcbae6
..
d8e1f0d
100644
(file)
--- a/
early-checksum.diff
+++ b/
early-checksum.diff
@@
-24,11
+24,11
@@
To use this patch, run these commands for a successful build:
extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
-@@ -85
0,6 +851
,15 @@ static struct file_struct *recv_file_ent
+@@ -85
9,6 +860
,15 @@ static struct file_struct *recv_file_ent
memcpy(bp, F_SUM(first), checksum_len);
} else
read_buf(f, bp, checksum_len);
memcpy(bp, F_SUM(first), checksum_len);
} else
read_buf(f, bp, checksum_len);
-+ if (pre_checksum &&
sum_len
) {
++ if (pre_checksum &&
bp != tmp_sum
) {
+ STRUCT_STAT st;
+ char *fname = f_name(file, NULL);
+ if (stat(fname, &st) == 0 && st.st_size == file_length) {
+ STRUCT_STAT st;
+ char *fname = f_name(file, NULL);
+ if (stat(fname, &st) == 0 && st.st_size == file_length) {
@@
-39,7
+39,7
@@
To use this patch, run these commands for a successful build:
+ }
}
+ }
}
- if (S_ISREG(mode) || S_ISLNK(mode))
+ #ifdef SUPPORT_ACLS
--- old/generator.c
+++ new/generator.c
@@ -73,6 +73,7 @@ extern int protocol_version;
--- old/generator.c
+++ new/generator.c
@@ -73,6 +73,7 @@ extern int protocol_version;
@@
-50,7
+50,7
@@
To use this patch, run these commands for a successful build:
extern int checksum_len;
extern char *partial_dir;
extern char *basis_dir[];
extern int checksum_len;
extern char *partial_dir;
extern char *basis_dir[];
-@@ -5
69,7 +570,8 @@ void itemize(struct file_struct *file, i
+@@ -5
90,7 +591,8 @@ void itemize(const char *fname, struct f
/* Perform our quick-check heuristic for determining if a file is unchanged. */
/* Perform our quick-check heuristic for determining if a file is unchanged. */
@@
-60,7
+60,7
@@
To use this patch, run these commands for a successful build:
{
if (st->st_size != F_LENGTH(file))
return 0;
{
if (st->st_size != F_LENGTH(file))
return 0;
-@@ -5
78,6 +580
,8 @@ int unchanged_file(char *fn, struct file
+@@ -5
99,6 +601
,8 @@ int unchanged_file(char *fn, struct file
of the file time to determine whether to sync */
if (always_checksum > 0 && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
of the file time to determine whether to sync */
if (always_checksum > 0 && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
@@
-69,38
+69,38
@@
To use this patch, run these commands for a successful build:
file_checksum(fn, sum, st->st_size);
return memcmp(sum, F_SUM(file), checksum_len) == 0;
}
file_checksum(fn, sum, st->st_size);
return memcmp(sum, F_SUM(file), checksum_len) == 0;
}
-@@ -81
6,7 +820
,7 @@ static int try_dests_reg(struct file_str
+@@ -81
9,7 +823
,7 @@ static int try_dests_reg(struct file_str
match_level = 1;
/* FALL THROUGH */
case 1:
match_level = 1;
/* FALL THROUGH */
case 1:
-- if (!unchanged_file(cmpbuf, file,
stp
))
-+ if (!unchanged_file(cmpbuf, 0, file,
stp
))
+- if (!unchanged_file(cmpbuf, file,
&sxp->st
))
++ if (!unchanged_file(cmpbuf, 0, file,
&sxp->st
))
continue;
best_match = j;
match_level = 2;
continue;
best_match = j;
match_level = 2;
-@@ -15
08,7 +1512
,7 @@ static void recv_generator(char *fname,
+@@ -15
24,7 +1528
,7 @@ static void recv_generator(char *fname,
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
-- else if (unchanged_file(fnamecmp, file, &st)) {
-+ else if (unchanged_file(fnamecmp, fnamecmp_type, file, &st)) {
+- else if (unchanged_file(fnamecmp, file, &s
x.s
t)) {
++ else if (unchanged_file(fnamecmp, fnamecmp_type, file, &s
x.s
t)) {
if (partialptr) {
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
--- old/hlink.c
+++ new/hlink.c
if (partialptr) {
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
--- old/hlink.c
+++ new/hlink.c
-@@ -38
2,7 +382
,7 @@ int hard_link_check(struct file_struct *
+@@ -38
4,7 +384
,7 @@ int hard_link_check(struct file_struct *
}
break;
}
}
break;
}
-- if (!unchanged_file(cmpbuf, file, &alt_st))
-+ if (!unchanged_file(cmpbuf, 0, file, &alt_st))
+- if (!unchanged_file(cmpbuf, file, &alt_s
x.s
t))
++ if (!unchanged_file(cmpbuf, 0, file, &alt_s
x.s
t))
continue;
statret = 1;
continue;
statret = 1;
- *stp = alt_st;
+ if (unchanged_attrs(cmpbuf, file, &alt_sx))
--- old/main.c
+++ new/main.c
--- old/main.c
+++ new/main.c
-@@ -4
6,6 +46
,7 @@ extern int module_id;
+@@ -4
5,6 +45
,7 @@ extern int module_id;
extern int copy_links;
extern int copy_dirlinks;
extern int keep_dirlinks;
extern int copy_links;
extern int copy_dirlinks;
extern int keep_dirlinks;
@@
-108,7
+108,7
@@
To use this patch, run these commands for a successful build:
extern int preserve_hard_links;
extern int protocol_version;
extern int file_total;
extern int preserve_hard_links;
extern int protocol_version;
extern int file_total;
-@@ -7
3,6 +74
,9 @@ extern char *password_file;
+@@ -7
2,6 +73
,9 @@ extern char *password_file;
extern char curr_dir[MAXPATHLEN];
extern struct filter_list_struct server_filter_list;
extern char curr_dir[MAXPATHLEN];
extern struct filter_list_struct server_filter_list;
@@
-118,7
+118,7
@@
To use this patch, run these commands for a successful build:
int local_server = 0;
int new_root_dir = 0;
mode_t orig_umask = 0;
int local_server = 0;
int new_root_dir = 0;
mode_t orig_umask = 0;
-@@ -79
3,6 +797
,7 @@ static void do_server_recv(int f_in, int
+@@ -79
2,6 +796
,7 @@ static void do_server_recv(int f_in, int
struct file_list *flist;
char *local_name = NULL;
char *dir = NULL;
struct file_list *flist;
char *local_name = NULL;
char *dir = NULL;
@@
-126,7
+126,7
@@
To use this patch, run these commands for a successful build:
int save_verbose = verbose;
if (filesfrom_fd >= 0) {
int save_verbose = verbose;
if (filesfrom_fd >= 0) {
-@@ -83
9,6 +844
,10 @@ static void do_server_recv(int f_in, int
+@@ -83
8,6 +843
,10 @@ static void do_server_recv(int f_in, int
filesfrom_fd = -1;
}
filesfrom_fd = -1;
}
@@
-137,7
+137,7
@@
To use this patch, run these commands for a successful build:
flist = recv_file_list(f_in);
if (!flist) {
rprintf(FERROR,"server_recv: recv_file_list error\n");
flist = recv_file_list(f_in);
if (!flist) {
rprintf(FERROR,"server_recv: recv_file_list error\n");
-@@ -84
8,6 +857
,9 @@ static void do_server_recv(int f_in, int
+@@ -84
7,6 +856
,9 @@ static void do_server_recv(int f_in, int
recv_additional_file_list(f_in);
verbose = save_verbose;
recv_additional_file_list(f_in);
verbose = save_verbose;
@@
-147,7
+147,7
@@
To use this patch, run these commands for a successful build:
if (argc > 0)
local_name = get_local_name(flist,argv[0]);
if (argc > 0)
local_name = get_local_name(flist,argv[0]);
-@@ -92
7,6 +939
,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -92
6,6 +938
,7 @@ int client_run(int f_in, int f_out, pid_
{
struct file_list *flist = NULL;
int exit_code = 0, exit_code2 = 0;
{
struct file_list *flist = NULL;
int exit_code = 0, exit_code2 = 0;
@@
-155,7
+155,7
@@
To use this patch, run these commands for a successful build:
char *local_name = NULL;
cleanup_child_pid = pid;
char *local_name = NULL;
cleanup_child_pid = pid;
-@@ -100
7,12 +1020
,19 @@ int client_run(int f_in, int f_out, pid_
+@@ -100
6,12 +1019
,19 @@ int client_run(int f_in, int f_out, pid_
filesfrom_fd = -1;
}
filesfrom_fd = -1;
}
@@
-177,7
+177,7
@@
To use this patch, run these commands for a successful build:
--- old/rsync.h
+++ new/rsync.h
--- old/rsync.h
+++ new/rsync.h
-@@ -7
1,6 +71
,7 @@
+@@ -7
0,6 +70
,7 @@
#define FLAG_HLINK_LAST (1<<7) /* receiver/generator */
#define FLAG_HLINK_DONE (1<<8) /* receiver/generator */
#define FLAG_LENGTH64 (1<<9) /* sender/receiver/generator */
#define FLAG_HLINK_LAST (1<<7) /* receiver/generator */
#define FLAG_HLINK_DONE (1<<8) /* receiver/generator */
#define FLAG_LENGTH64 (1<<9) /* sender/receiver/generator */