--- old/flist.c
+++ new/flist.c
-@@ -31,6 +31,7 @@ extern int am_daemon;
- extern int am_sender;
+@@ -33,6 +33,7 @@ extern int am_generator;
+ extern int inc_recurse;
extern int do_progress;
extern int always_checksum;
+extern int pre_checksum;
extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
-@@ -785,6 +786,15 @@ static struct file_struct *recv_file_ent
+@@ -955,6 +956,15 @@ static struct file_struct *recv_file_ent
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) {
+ }
}
- return file;
+ #ifdef SUPPORT_ACLS
--- old/generator.c
+++ new/generator.c
-@@ -70,6 +70,7 @@ extern int ignore_timeout;
- extern int protocol_version;
+@@ -73,6 +73,7 @@ extern int protocol_version;
+ extern int file_total;
extern int fuzzy_basis;
extern int always_checksum;
+extern int pre_checksum;
extern int checksum_len;
extern char *partial_dir;
extern char *basis_dir[];
-@@ -577,7 +578,8 @@ void itemize(struct file_struct *file, i
+@@ -618,7 +619,8 @@ void itemize(const char *fnamecmp, struc
/* Perform our quick-check heuristic for determining if a file is unchanged. */
{
if (st->st_size != F_LENGTH(file))
return 0;
-@@ -586,6 +588,8 @@ int unchanged_file(char *fn, struct file
+@@ -627,6 +629,8 @@ int unchanged_file(char *fn, struct file
of the file time to determine whether to sync */
- if (always_checksum && S_ISREG(st->st_mode)) {
- char sum[MD4_SUM_LENGTH];
+ if (always_checksum > 0 && S_ISREG(st->st_mode)) {
+ char sum[MAX_DIGEST_LEN];
+ if (pre_checksum && fnamecmp_type == FNAMECMP_FNAME)
+ return !(file->flags & FLAG_SUM_DIFFERS);
file_checksum(fn, sum, st->st_size);
return memcmp(sum, F_SUM(file), checksum_len) == 0;
}
-@@ -825,7 +829,7 @@ static int try_dests_reg(struct file_str
+@@ -847,7 +851,7 @@ static int try_dests_reg(struct file_str
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;
-@@ -1511,7 +1515,7 @@ static void recv_generator(char *fname,
+@@ -1575,7 +1579,7 @@ static void recv_generator(char *fname,
;
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, &sx.st)) {
++ else if (unchanged_file(fnamecmp, fnamecmp_type, file, &sx.st)) {
if (partialptr) {
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
--- old/hlink.c
+++ new/hlink.c
-@@ -448,7 +448,7 @@ int hard_link_check(struct file_struct *
+@@ -392,7 +392,7 @@ int hard_link_check(struct file_struct *
}
break;
}
-- if (!unchanged_file(cmpbuf, file, &alt_st))
-+ if (!unchanged_file(cmpbuf, 0, file, &alt_st))
+- if (!unchanged_file(cmpbuf, file, &alt_sx.st))
++ if (!unchanged_file(cmpbuf, 0, file, &alt_sx.st))
continue;
statret = 1;
- *stp = alt_st;
+ if (unchanged_attrs(cmpbuf, file, &alt_sx))
--- old/main.c
+++ new/main.c
-@@ -47,6 +47,7 @@ extern int copy_dirlinks;
+@@ -45,6 +45,7 @@ extern int module_id;
+ extern int copy_links;
+ extern int copy_dirlinks;
extern int keep_dirlinks;
++extern int always_checksum;
extern int preserve_hard_links;
extern int protocol_version;
-+extern int always_checksum;
- extern int recurse;
- extern int relative_paths;
- extern int sanitize_paths;
-@@ -71,6 +72,9 @@ extern char *batch_name;
+ extern int file_total;
+@@ -72,6 +73,9 @@ extern char *password_file;
extern char curr_dir[MAXPATHLEN];
extern struct filter_list_struct server_filter_list;
int local_server = 0;
int new_root_dir = 0;
mode_t orig_umask = 0;
-@@ -788,6 +792,7 @@ static void do_server_recv(int f_in, int
+@@ -792,6 +796,7 @@ static void do_server_recv(int f_in, int
struct file_list *flist;
char *local_name = NULL;
char *dir = NULL;
int save_verbose = verbose;
if (filesfrom_fd >= 0) {
-@@ -831,6 +836,10 @@ static void do_server_recv(int f_in, int
+@@ -838,6 +843,10 @@ static void do_server_recv(int f_in, int
filesfrom_fd = -1;
}
+ pre_checksum = push_dir(argv[0], 0);
+
flist = recv_file_list(f_in);
- verbose = save_verbose;
if (!flist) {
-@@ -839,6 +848,9 @@ static void do_server_recv(int f_in, int
- }
- the_file_list = flist;
+ rprintf(FERROR,"server_recv: recv_file_list error\n");
+@@ -847,6 +856,9 @@ static void do_server_recv(int f_in, int
+ recv_additional_file_list(f_in);
+ verbose = save_verbose;
+ if (pre_checksum)
+ pop_dir(olddir);
if (argc > 0)
local_name = get_local_name(flist,argv[0]);
-@@ -918,6 +930,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -926,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;
char *local_name = NULL;
cleanup_child_pid = pid;
-@@ -992,11 +1005,18 @@ int client_run(int f_in, int f_out, pid_
+@@ -1006,12 +1019,19 @@ int client_run(int f_in, int f_out, pid_
filesfrom_fd = -1;
}
if (write_batch && !am_server)
start_write_batch(f_in);
flist = recv_file_list(f_in);
- the_file_list = flist;
+ if (inc_recurse && file_total == 1)
+ recv_additional_file_list(f_in);
+ 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
-@@ -68,6 +68,7 @@
- #define FLAG_HLINK_LAST (1<<7) /* receiver/generator */
+@@ -71,6 +71,7 @@
#define FLAG_HLINK_DONE (1<<8) /* receiver/generator */
#define FLAG_LENGTH64 (1<<9) /* sender/receiver/generator */
-+#define FLAG_SUM_DIFFERS (1<<10)/* receiver/generator */
+ #define FLAG_SKIP_GROUP (1<<10) /* receiver/generator */
++#define FLAG_SUM_DIFFERS (1<<11)/* receiver/generator */
+
+ /* These flags are passed to functions but not stored. */
- #define BITS_SET(val,bits) (((val) & (bits)) == (bits))
- #define BITS_SETnUNSET(val,onbits,offbits) (((val) & ((onbits)|(offbits))) == (onbits))
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff