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
paranoia change - treat list_only like read_only and refuse all
[rsync/rsync.git]
/
match.c
diff --git
a/match.c
b/match.c
index
272025a
..
dc4dbd1
100644
(file)
--- a/
match.c
+++ b/
match.c
@@
-94,7
+94,7
@@
static void matched(int f,struct sum_struct *s,struct map_struct *buf,
OFF_T offset,int i)
{
OFF_T n = offset - last_match;
OFF_T offset,int i)
{
OFF_T n = offset - last_match;
-
int
j;
+
OFF_T
j;
if (verbose > 2 && i >= 0)
rprintf(FINFO,"match at %d last_match=%d j=%d len=%d n=%d\n",
if (verbose > 2 && i >= 0)
rprintf(FINFO,"match at %d last_match=%d j=%d len=%d n=%d\n",
@@
-118,6
+118,11
@@
static void matched(int f,struct sum_struct *s,struct map_struct *buf,
last_match = offset + s->sums[i].len;
else
last_match = offset;
last_match = offset + s->sums[i].len;
else
last_match = offset;
+
+ if (buf)
+ show_progress(last_match, buf->size);
+
+ if (i == -1) end_progress();
}
}
@@
-252,6
+257,12
@@
void match_sums(int f,struct sum_struct *s,struct map_struct *buf,OFF_T len)
if (verbose > 2)
rprintf(FINFO,"done hash search\n");
} else {
if (verbose > 2)
rprintf(FINFO,"done hash search\n");
} else {
+ OFF_T j;
+ /* by doing this in pieces we avoid too many seeks */
+ for (j=0;j<(len-CHUNK_SIZE);j+=CHUNK_SIZE) {
+ int n1 = MIN(CHUNK_SIZE,(len-CHUNK_SIZE)-j);
+ matched(f,s,buf,j+n1,-2);
+ }
matched(f,s,buf,len,-1);
}
matched(f,s,buf,len,-1);
}