Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some temporary code for 2.6.4pre3 compatibility (which can be
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
d4680d3
..
92954d4
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-337,8
+337,6
@@
void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
|| (xname && *xname)) && !read_batch) {
if (protocol_version >= 29) {
if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
|| (xname && *xname)) && !read_batch) {
if (protocol_version >= 29) {
- if (iflags & (ITEM_LOCAL_CHANGE|ITEM_TRANSFER))/* XXX */
- iflags |= ITEM_DUMMY_BIT; /* XXX Remove soon */
if (ndx >= 0)
write_int(sock_f_out, ndx);
write_shortint(sock_f_out, iflags);
if (ndx >= 0)
write_int(sock_f_out, ndx);
write_shortint(sock_f_out, iflags);
@@
-507,7
+505,7
@@
static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
{
int fname_len, fname_suf_len;
const char *fname_suf, *fname = file->basename;
{
int fname_len, fname_suf_len;
const char *fname_suf, *fname = file->basename;
- uint32 lowest_dist =
0x7FFFFFFF;
+ uint32 lowest_dist =
25 << 16; /* ignore a distance greater than 25 */
int j, lowest_j = -1;
fname_len = strlen(fname);
int j, lowest_j = -1;
fname_len = strlen(fname);