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
The patches for 3.0.3.
[rsync/rsync-patches.git]
/
checksum-updating.diff
diff --git
a/checksum-updating.diff
b/checksum-updating.diff
index
dab490a
..
e85c8a7
100644
(file)
--- a/
checksum-updating.diff
+++ b/
checksum-updating.diff
@@
-463,7
+463,7
@@
diff --git a/generator.c b/generator.c
else
file_checksum(fn, st->st_size, sum);
return memcmp(sum, F_SUM(file), checksum_len) == 0;
else
file_checksum(fn, st->st_size, sum);
return memcmp(sum, F_SUM(file), checksum_len) == 0;
-@@ -136
5,7 +1366
,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -136
6,7 +1367
,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, 1);
}
if (checksum_files) {
fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, 1);
}
if (checksum_files) {
@@
-473,7
+473,7
@@
diff --git a/generator.c b/generator.c
}
need_new_dirscan = 0;
}
}
need_new_dirscan = 0;
}
-@@ -151
5,6 +1517
,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -151
6,6 +1518
,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
else
change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
}
else
change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
}
@@
-481,7
+481,7
@@
diff --git a/generator.c b/generator.c
goto cleanup;
}
goto cleanup;
}
-@@ -180
7,6 +1810
,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -180
8,6 +1811
,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
handle_partial_dir(partialptr, PDIR_DELETE);
}
set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);
handle_partial_dir(partialptr, PDIR_DELETE);
}
set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);
@@
-490,7
+490,7
@@
diff --git a/generator.c b/generator.c
if (itemizing)
itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL);
#ifdef SUPPORT_HARD_LINKS
if (itemizing)
itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL);
#ifdef SUPPORT_HARD_LINKS
-@@ -224
3,6 +2248
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -224
7,6 +2252
,7 @@ void generate_files(int f_out, const char *local_name)
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
@@
-498,7
+498,7
@@
diff --git a/generator.c b/generator.c
}
for (i = cur_flist->low; i <= cur_flist->high; i++) {
struct file_struct *file = cur_flist->sorted[i];
}
for (i = cur_flist->low; i <= cur_flist->high; i++) {
struct file_struct *file = cur_flist->sorted[i];
-@@ -232
3,6 +2329
,9 @@ void generate_files(int f_out, const char *local_name)
+@@ -232
7,6 +2333
,9 @@ void generate_files(int f_out, const char *local_name)
wait_for_receiver();
}
wait_for_receiver();
}
@@
-595,7
+595,7
@@
diff --git a/receiver.c b/receiver.c
diff --git a/rsync.h b/rsync.h
--- a/rsync.h
+++ b/rsync.h
diff --git a/rsync.h b/rsync.h
--- a/rsync.h
+++ b/rsync.h
-@@ -87
1,6 +871
,8 @@ typedef struct {
+@@ -87
4,6 +874
,8 @@ typedef struct {
#define CSF_ENABLE (1<<1)
#define CSF_LAX (1<<2)
#define CSF_ENABLE (1<<1)
#define CSF_LAX (1<<2)