X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/264042760bd909eeca281dc8c937357e98bf6bf8..9742b386b3d5b3010675aef9febaffbf8ab2d2c0:/match.c

diff --git a/match.c b/match.c
index cbc856c2..9719319a 100644
--- a/match.c
+++ b/match.c
@@ -3,12 +3,11 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -304,7 +303,8 @@ static void hash_search(int f,struct sum_struct *s,
  **/
 void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
 {
-	char file_sum[MD4_SUM_LENGTH];
+	char file_sum[MAX_DIGEST_LEN];
+	int sum_len;
 
 	last_match = 0;
 	false_alarms = 0;
@@ -314,7 +314,7 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
 
 	sum_init(checksum_seed);
 
-	if (append_mode) {
+	if (append_mode > 0) {
 		OFF_T j = 0;
 		for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) {
 			if (buf && do_progress)
@@ -324,10 +324,10 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
 			last_match = j;
 		}
 		if (last_match < s->flength) {
-			int32 len = (int32)(s->flength - last_match);
+			int32 n = (int32)(s->flength - last_match);
 			if (buf && do_progress)
 				show_progress(last_match, buf->file_size);
-			sum_update(map_ptr(buf, last_match, len), len);
+			sum_update(map_ptr(buf, last_match, n), n);
 			last_match = s->flength;
 		}
 		s->count = 0;
@@ -339,7 +339,7 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
 		if (verbose > 2)
 			rprintf(FINFO,"built hash table\n");
 
-		hash_search(f,s,buf,len);
+		hash_search(f, s, buf, len);
 
 		if (verbose > 2)
 			rprintf(FINFO,"done hash search\n");
@@ -351,14 +351,14 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
 		matched(f, s, buf, len, -1);
 	}
 
-	sum_end(file_sum);
+	sum_len = sum_end(file_sum);
 	/* If we had a read error, send a bad checksum. */
 	if (buf && buf->status != 0)
 		file_sum[0]++;
 
 	if (verbose > 2)
 		rprintf(FINFO,"sending file_sum\n");
-	write_buf(f,file_sum,MD4_SUM_LENGTH);
+	write_buf(f, file_sum, sum_len);
 
 	if (verbose > 2)
 		rprintf(FINFO, "false_alarms=%d hash_hits=%d matches=%d\n",