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
91be967
..
4b72302
100644
(file)
--- a/
early-checksum.diff
+++ b/
early-checksum.diff
@@
-16,7
+16,7
@@
To use this patch, run these commands for a successful build:
--- old/flist.c
+++ new/flist.c
--- old/flist.c
+++ new/flist.c
-@@ -3
4,6 +34
,7 @@ extern int am_generator;
+@@ -3
3,6 +33
,7 @@ extern int am_generator;
extern int inc_recurse;
extern int do_progress;
extern int always_checksum;
extern int inc_recurse;
extern int do_progress;
extern int always_checksum;
@@
-24,7
+24,7
@@
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;
-@@ -9
48,6 +949
,15 @@ static struct file_struct *recv_file_ent
+@@ -9
55,6 +956
,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);
@@
-42,7
+42,7
@@
To use this patch, run these commands for a successful build:
#ifdef SUPPORT_ACLS
--- old/generator.c
+++ new/generator.c
#ifdef SUPPORT_ACLS
--- old/generator.c
+++ new/generator.c
-@@ -7
4,6 +74
,7 @@ extern int protocol_version;
+@@ -7
3,6 +73
,7 @@ extern int protocol_version;
extern int file_total;
extern int fuzzy_basis;
extern int always_checksum;
extern int file_total;
extern int fuzzy_basis;
extern int always_checksum;
@@
-78,7
+78,7
@@
To use this patch, run these commands for a successful build:
continue;
best_match = j;
match_level = 2;
continue;
best_match = j;
match_level = 2;
-@@ -15
59,7 +1563
,7 @@ static void recv_generator(char *fname,
+@@ -15
75,7 +1579
,7 @@ static void recv_generator(char *fname,
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
@@
-89,7
+89,7
@@
To use this patch, run these commands for a successful build:
handle_partial_dir(partialptr, PDIR_DELETE);
--- old/hlink.c
+++ new/hlink.c
handle_partial_dir(partialptr, PDIR_DELETE);
--- old/hlink.c
+++ new/hlink.c
-@@ -39
3,7 +393
,7 @@ int hard_link_check(struct file_struct *
+@@ -39
2,7 +392
,7 @@ int hard_link_check(struct file_struct *
}
break;
}
}
break;
}
@@
-100,7
+100,7
@@
To use this patch, run these commands for a successful build:
if (unchanged_attrs(cmpbuf, file, &alt_sx))
--- old/main.c
+++ new/main.c
if (unchanged_attrs(cmpbuf, file, &alt_sx))
--- 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;
}
@@
-172,12
+172,12
@@
To use this patch, run these commands for a successful build:
+ if (pre_checksum)
+ pop_dir(olddir);
+
+ if (pre_checksum)
+ pop_dir(olddir);
+
- if (flist && flist->
count
> 0) {
+ if (flist && flist->
used
> 0) {
local_name = get_local_name(flist, argv[0]);
--- old/rsync.h
+++ new/rsync.h
local_name = get_local_name(flist, argv[0]);
--- old/rsync.h
+++ new/rsync.h
-@@ -7
2,6 +72
,7 @@
+@@ -7
1,6 +71
,7 @@
#define FLAG_HLINK_DONE (1<<8) /* receiver/generator */
#define FLAG_LENGTH64 (1<<9) /* sender/receiver/generator */
#define FLAG_SKIP_GROUP (1<<10) /* receiver/generator */
#define FLAG_HLINK_DONE (1<<8) /* receiver/generator */
#define FLAG_LENGTH64 (1<<9) /* sender/receiver/generator */
#define FLAG_SKIP_GROUP (1<<10) /* receiver/generator */