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 a failing hunk.
[rsync/rsync-patches.git]
/
early-checksum.diff
diff --git
a/early-checksum.diff
b/early-checksum.diff
index
0041db4
..
c16aa57
100644
(file)
--- a/
early-checksum.diff
+++ b/
early-checksum.diff
@@
-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;
-@@ -
701,6 +702
,16 @@ static struct file_struct *receive_file_
+@@ -
692,6 +693
,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);
@@
-64,7
+64,7
@@
for a local copy, so the old algorithm is used for local copies.
file_checksum(fn, sum, st->st_size);
return memcmp(sum, file->u.sum, checksum_len) == 0;
}
file_checksum(fn, sum, st->st_size);
return memcmp(sum, file->u.sum, checksum_len) == 0;
}
-@@ -62
0,7 +624
,7 @@ static int try_dests_reg(struct file_str
+@@ -62
6,7 +630
,7 @@ static int try_dests_reg(struct file_str
match_level = 1;
/* FALL THROUGH */
case 1:
match_level = 1;
/* FALL THROUGH */
case 1:
@@
-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;
-@@ -11
82,7 +1186
,7 @@ static void recv_generator(char *fname,
+@@ -11
94,7 +1198
,7 @@ static void recv_generator(char *fname,
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
@@
-103,15
+103,17
@@
for a local copy, so the old algorithm is used for local copies.
extern int recurse;
extern int relative_paths;
extern int sanitize_paths;
extern int recurse;
extern int relative_paths;
extern int sanitize_paths;
-@@ -6
8,6 +69,7 @@ extern char *batch_name
;
-
- extern
char curr_dir[MAXPATHLEN]
;
+@@ -6
9,6 +70,9 @@ extern char *shell_cmd
;
+ extern char *batch_name;
+ extern
struct filter_list_struct server_filter_list
;
++extern char curr_dir[MAXPATHLEN];
++
+int pre_checksum = 0;
int local_server = 0;
mode_t orig_umask = 0;
struct file_list *the_file_list;
+int pre_checksum = 0;
int local_server = 0;
mode_t orig_umask = 0;
struct file_list *the_file_list;
-@@ -7
36,6 +738
,7 @@ static void do_server_recv(int f_in, int
+@@ -7
49,6 +753
,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;
@@
-119,7
+121,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
79,6 +782
,10 @@ static void do_server_recv(int f_in, int
+@@ -7
92,6 +797
,10 @@ static void do_server_recv(int f_in, int
filesfrom_fd = -1;
}
filesfrom_fd = -1;
}
@@
-130,7
+132,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) {
-@@ -
787,6 +794
,9 @@ static void do_server_recv(int f_in, int
+@@ -
800,6 +809
,9 @@ static void do_server_recv(int f_in, int
}
the_file_list = flist;
}
the_file_list = flist;
@@
-140,7
+142,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
48,6 +858
,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -8
83,6 +895
,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;
@@
-148,7
+150,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;
-@@ -9
22,11 +933
,18 @@ int client_run(int f_in, int f_out, pid_
+@@ -9
57,11 +970
,18 @@ int client_run(int f_in, int f_out, pid_
filesfrom_fd = -1;
}
filesfrom_fd = -1;
}