diff options
author | Wayne Davison <wayned@samba.org> | 2011-01-14 21:32:15 -0800 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2011-01-14 21:32:15 -0800 |
commit | 580cffdec9e6ef149bc9d2aa79bc46d302f08a73 (patch) | |
tree | 20d88c2b8000ac232999fe19c963d577b37ddf8c /match.c | |
parent | 58a1c1a218575ce80f8cd7f59526fa9047d7d0e6 (diff) | |
download | android_external_rsync-580cffdec9e6ef149bc9d2aa79bc46d302f08a73.tar.gz android_external_rsync-580cffdec9e6ef149bc9d2aa79bc46d302f08a73.tar.bz2 android_external_rsync-580cffdec9e6ef149bc9d2aa79bc46d302f08a73.zip |
Sender realigns chunks with generator during an --inplace copy
when sending a sequence of zeros.
Diffstat (limited to 'match.c')
-rw-r--r-- | match.c | 24 |
1 files changed, 21 insertions, 3 deletions
@@ -237,10 +237,11 @@ static void hash_search(int f,struct sum_struct *s, /* All the generator's chunks start at blength boundaries. */ while (aligned_offset < offset) aligned_offset += s->blength; - if (offset == aligned_offset) { + if (offset == aligned_offset + || (sum == 0 && l == s->blength && aligned_offset + l <= len)) { int32 i2; for (i2 = i; i2 >= 0; i2 = s->sums[i2].chain) { - if (s->sums[i2].offset != offset) + if (s->sums[i2].offset != aligned_offset) continue; if (i2 != i) { if (sum != s->sums[i2].sum1 @@ -249,9 +250,26 @@ static void hash_search(int f,struct sum_struct *s, break; i = i2; } + want_i = i; + if (offset != aligned_offset) { + /* We've matched some zeros in a spot that is also zeros + * further along in the basis file, if we find zeros ahead + * in the sender's file, we'll output enough literal data + * to re-align with the basis file, and get back to seeking + * instead of writing. */ + map = (schar *)map_ptr(buf, aligned_offset, l); + sum = get_checksum1((char *)map, l); + if (sum != s->sums[i2].sum1) + break; + get_checksum2((char *)map, l, sum2); + if (memcmp(sum2, s->sums[i2].sum2, s->s2length) != 0) + break; + /* OK, we have a re-alignment match. Bump the offset + * forward to the new match point. */ + offset = aligned_offset; + } /* This chunk remained in the same spot in the old and new file. */ s->sums[i].flags |= SUMFLG_SAME_OFFSET; - want_i = i; break; } } |