X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f94e821c782952437d7fe5a2ae1e0b1db8a4f4ab..27d3cdbc943a57d64f4f2a35a4f1e1b15d9ca41f:/checksum.c

diff --git a/checksum.c b/checksum.c
index 1fd1c55c..2262728c 100644
--- a/checksum.c
+++ b/checksum.c
@@ -19,7 +19,7 @@
 
 #include "rsync.h"
 
-int csum_length=SUM_LENGTH;
+int csum_length=2; /* initial value */
 
 #define CSUM_CHUNK 64
 
@@ -30,18 +30,20 @@ extern int remote_version;
   a simple 32 bit checksum that can be upadted from either end
   (inspired by Mark Adler's Adler-32 checksum)
   */
-uint32 get_checksum1(char *buf,int len)
+uint32 get_checksum1(char *buf1,int len)
 {
     int i;
     uint32 s1, s2;
+    schar *buf = (schar *)buf1;
 
     s1 = s2 = 0;
     for (i = 0; i < (len-4); i+=4) {
-	s2 += 4*(s1 + buf[i]) + 3*buf[i+1] + 2*buf[i+2] + buf[i+3];
-	s1 += (buf[i+0] + buf[i+1] + buf[i+2] + buf[i+3]); 
+	s2 += 4*(s1 + buf[i]) + 3*buf[i+1] + 2*buf[i+2] + buf[i+3] + 
+	  10*CHAR_OFFSET;
+	s1 += (buf[i+0] + buf[i+1] + buf[i+2] + buf[i+3] + 4*CHAR_OFFSET); 
     }
     for (; i < len; i++) {
-	s1 += buf[i]; s2 += s1;
+	s1 += (buf[i]+CHAR_OFFSET); s2 += s1;
     }
     return (s1 & 0xffff) + (s2 << 16);
 }
@@ -63,8 +65,8 @@ void get_checksum2(char *buf,int len,char *sum)
 {
   int i;
   MDstruct MD;
-  static char *buf1 = NULL;
-  static int len1 = 0;
+  static char *buf1;
+  static int len1;
 
   if (len > len1) {
     if (buf1) free(buf1);
@@ -75,7 +77,7 @@ void get_checksum2(char *buf,int len,char *sum)
 
   MDbegin(&MD);
 
-  bcopy(buf,buf1,len);
+  memcpy(buf1,buf,len);
   if (checksum_seed) {
     SIVAL(buf1,len,checksum_seed);
     len += 4;
@@ -91,16 +93,16 @@ void get_checksum2(char *buf,int len,char *sum)
 }
 
 
-void file_checksum(char *fname,char *sum,off_t size)
+void file_checksum(char *fname,char *sum,OFF_T size)
 {
-  int i;
+  OFF_T i;
   MDstruct MD;
   struct map_struct *buf;
   int fd;
-  int len = size;
+  OFF_T len = size;
   char tmpchunk[CSUM_CHUNK];
 
-  bzero(sum,csum_length);
+  memset(sum,0,csum_length);
 
   fd = open(fname,O_RDONLY);
   if (fd == -1) return;
@@ -110,12 +112,12 @@ void file_checksum(char *fname,char *sum,off_t size)
   MDbegin(&MD);
 
   for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
-    bcopy(map_ptr(buf,i,CSUM_CHUNK),tmpchunk,CSUM_CHUNK);
+    memcpy(tmpchunk, map_ptr(buf,i,CSUM_CHUNK), CSUM_CHUNK);
     MDupdate(&MD, tmpchunk, CSUM_CHUNK*8);
   }
 
   if (len - i > 0) {
-    bcopy(map_ptr(buf,i,len-i),tmpchunk,len-i);
+    memcpy(tmpchunk, map_ptr(buf,i,len-i), len-i);
     MDupdate(&MD, tmpchunk, (len-i)*8);
   }
 
@@ -153,27 +155,27 @@ void sum_update(char *p,int len)
 {
   int i;
   if (len + sumresidue < CSUM_CHUNK) {
-    bcopy(p,sumrbuf+sumresidue,len);
+    memcpy(sumrbuf+sumresidue, p, len);
     sumresidue += len;
     return;
   }
 
   if (sumresidue) {
     i = MIN(CSUM_CHUNK-sumresidue,len);
-    bcopy(p,sumrbuf+sumresidue,i);
+    memcpy(sumrbuf+sumresidue,p,i);
     MDupdate(&sumMD, sumrbuf, (i+sumresidue)*8);
     len -= i;
     p += i;
   }
 
   for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
-    bcopy(p+i,sumrbuf,CSUM_CHUNK);
+    memcpy(sumrbuf,p+i,CSUM_CHUNK);
     MDupdate(&sumMD, sumrbuf, CSUM_CHUNK*8);
   }
 
   if (len - i > 0) {
     sumresidue = len-i;
-    bcopy(p+i,sumrbuf,sumresidue);
+    memcpy(sumrbuf,p+i,sumresidue);
   } else {
     sumresidue = 0;    
   }