[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  3f26945 Include backup in map_ptr() to avoid backing up when reading.
      from  580cffd Sender realigns chunks with generator during an --inplace copy when sending a sequence of zeros.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3f26945cb1a602d3f838507ac77079f649bf9086
Author: Wayne Davison <wayned at samba.org>
Date:   Sat Jan 15 11:16:49 2011 -0800

    Include backup in map_ptr() to avoid backing up when reading.

-----------------------------------------------------------------------

Summary of changes:
 match.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/match.c b/match.c
index cbb6fe2..f8a1a8f 100644
--- a/match.c
+++ b/match.c
@@ -257,7 +257,11 @@ static void hash_search(int f,struct sum_struct *s,
 							 * 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);
+							backup = (int32)(aligned_offset - last_match);
+							if (backup < 0)
+								backup = 0;
+							map = (schar *)map_ptr(buf, aligned_offset - backup, l + backup)
+							    + backup;
 							sum = get_checksum1((char *)map, l);
 							if (sum != s->sums[i2].sum1)
 								break;


-- 
The rsync repository.