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
Changed the style of the diff headers (use "patch -p1" now).
[rsync/rsync-patches.git]
/
early-checksum.diff
diff --git
a/early-checksum.diff
b/early-checksum.diff
index
1a415d7
..
0f66edc
100644
(file)
--- a/
early-checksum.diff
+++ b/
early-checksum.diff
@@
-8,8
+8,8
@@
to its checksum pass during its normal find-the-different-files pass.
I have benchmarked this a little, and it appears to slow things down
for a local copy, so the old algorithm is used for local copies.
I have benchmarked this a little, and it appears to slow things down
for a local copy, so the old algorithm is used for local copies.
---- o
rig/flist.c 2006-01-21 21:02:30
-+++
flist.c 2005-09-16 16:41:25
+--- o
ld/flist.c
++++
new/flist.c
@@ -36,6 +36,7 @@ extern int am_daemon;
extern int am_sender;
extern int do_progress;
@@ -36,6 +36,7 @@ extern int am_daemon;
extern int am_sender;
extern int do_progress;
@@
-18,7
+18,7
@@
for a local copy, so the old algorithm is used for local copies.
extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
-@@ -7
08,6 +709
,16 @@ static struct file_struct *receive_file_
+@@ -7
11,6 +712
,16 @@ static struct file_struct *receive_file_
sum = empty_sum;
}
read_buf(f, sum, checksum_len);
sum = empty_sum;
}
read_buf(f, sum, checksum_len);
@@
-34,10
+34,10
@@
for a local copy, so the old algorithm is used for local copies.
+ }
}
+ }
}
- if (!preserve_perms) {
---- o
rig/generator.c 2006-01-21 21:02:30
-+++
generator.c 2005-12-15 23:16:48
-@@ -
69,6 +69
,7 @@ extern int ignore_timeout;
+ return file;
+--- o
ld/generator.c
++++
new/generator.c
+@@ -
71,6 +71
,7 @@ extern int ignore_timeout;
extern int protocol_version;
extern int fuzzy_basis;
extern int always_checksum;
extern int protocol_version;
extern int fuzzy_basis;
extern int always_checksum;
@@
-73,7
+73,7
@@
for a local copy, so the old algorithm is used for local copies.
continue;
best_match = j;
match_level = 2;
continue;
best_match = j;
match_level = 2;
-@@ -114
5,7 +1149
,7 @@ static void recv_generator(char *fname,
+@@ -114
7,7 +1151
,7 @@ static void recv_generator(char *fname,
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
@@
-82,8
+82,8
@@
for a local copy, so the old algorithm is used for local copies.
if (partialptr) {
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
if (partialptr) {
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
---- o
rig/hlink.c 2006-01-14 20:27:09
-+++
hlink.c 2005-12-15 23:17:31
+--- o
ld/hlink.c
++++
new/hlink.c
@@ -210,7 +210,7 @@ int hard_link_check(struct file_struct *
itemizing = code = 0;
break;
@@ -210,7 +210,7 @@ int hard_link_check(struct file_struct *
itemizing = code = 0;
break;
@@
-93,8
+93,8
@@
for a local copy, so the old algorithm is used for local copies.
continue;
statret = 1;
st = &st3;
continue;
statret = 1;
st = &st3;
---- o
rig/main.c 2006-01-15 14:46:15
-+++
main.c 2005-11-07 05:00:49
+--- o
ld/main.c
++++
new/main.c
@@ -45,6 +45,7 @@ extern int copy_links;
extern int keep_dirlinks;
extern int preserve_hard_links;
@@ -45,6 +45,7 @@ extern int copy_links;
extern int keep_dirlinks;
extern int preserve_hard_links;
@@
-114,7
+114,7
@@
for a local copy, so the old algorithm is used for local copies.
struct file_list *the_file_list;
/* There's probably never more than at most 2 outstanding child processes,
struct file_list *the_file_list;
/* There's probably never more than at most 2 outstanding child processes,
-@@ -71
0,6 +713
,7 @@ static void do_server_recv(int f_in, int
+@@ -71
9,6 +722
,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;
@@
-122,7
+122,7
@@
for a local copy, so the old algorithm is used for local copies.
int save_verbose = verbose;
if (filesfrom_fd >= 0) {
int save_verbose = verbose;
if (filesfrom_fd >= 0) {
-@@ -7
53,6 +757
,10 @@ static void do_server_recv(int f_in, int
+@@ -7
62,6 +766
,10 @@ static void do_server_recv(int f_in, int
filesfrom_fd = -1;
}
filesfrom_fd = -1;
}
@@
-133,7
+133,7
@@
for a local copy, so the old algorithm is used for local copies.
flist = recv_file_list(f_in);
verbose = save_verbose;
if (!flist) {
flist = recv_file_list(f_in);
verbose = save_verbose;
if (!flist) {
-@@ -7
61,6 +769
,9 @@ static void do_server_recv(int f_in, int
+@@ -7
70,6 +778
,9 @@ static void do_server_recv(int f_in, int
}
the_file_list = flist;
}
the_file_list = flist;
@@
-143,7
+143,7
@@
for a local copy, so the old algorithm is used for local copies.
if (argc > 0)
local_name = get_local_name(flist,argv[0]);
if (argc > 0)
local_name = get_local_name(flist,argv[0]);
-@@ -8
09,6 +820
,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -8
21,6 +832
,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;
@@
-151,7
+151,7
@@
for a local copy, so the old algorithm is used for local copies.
char *local_name = NULL;
cleanup_child_pid = pid;
char *local_name = NULL;
cleanup_child_pid = pid;
-@@ -8
80,11 +892
,18 @@ int client_run(int f_in, int f_out, pid_
+@@ -8
95,11 +907
,18 @@ int client_run(int f_in, int f_out, pid_
filesfrom_fd = -1;
}
filesfrom_fd = -1;
}
@@
-170,8
+170,8
@@
for a local copy, so the old algorithm is used for local copies.
if (flist && flist->count > 0) {
local_name = get_local_name(flist, argv[0]);
if (flist && flist->count > 0) {
local_name = get_local_name(flist, argv[0]);
---- o
rig/rsync.h 2006-01-21 21:02:30
-+++
rsync.h 2006-01-21 21:08:49
+--- o
ld/rsync.h
++++
new/rsync.h
@@ -64,6 +64,7 @@
#define FLAG_DEL_HERE (1<<3) /* receiver/generator */
#define FLAG_HLINK_TOL (1<<4) /* receiver/generator */
@@ -64,6 +64,7 @@
#define FLAG_DEL_HERE (1<<3) /* receiver/generator */
#define FLAG_HLINK_TOL (1<<4) /* receiver/generator */