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

diff --git a/checksum.c b/checksum.c
index eac41c4e..2262728c 100644
--- a/checksum.c
+++ b/checksum.c
@@ -19,29 +19,31 @@
 
 #include "rsync.h"
 
-int csum_length=SUM_LENGTH;
+int csum_length=2; /* initial value */
 
 #define CSUM_CHUNK 64
 
-static char *tmpchunk = NULL;
-
+int checksum_seed = 0;
+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,30 +65,44 @@ void get_checksum2(char *buf,int len,char *sum)
 {
   int i;
   MDstruct MD;
+  static char *buf1;
+  static int len1;
+
+  if (len > len1) {
+    if (buf1) free(buf1);
+    buf1 = (char *)malloc(len+4);
+    len1 = len;
+    if (!buf1) out_of_memory("get_checksum2");
+  }
 
   MDbegin(&MD);
 
-  for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
-    bcopy(buf+i,tmpchunk,CSUM_CHUNK);
-    MDupdate(&MD, tmpchunk, CSUM_CHUNK*8);
+  memcpy(buf1,buf,len);
+  if (checksum_seed) {
+    SIVAL(buf1,len,checksum_seed);
+    len += 4;
   }
 
-  bcopy(buf+i,tmpchunk,len-i);
-  MDupdate(&MD, tmpchunk, (len-i)*8);
+  for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) {
+    MDupdate(&MD, buf1+i, CSUM_CHUNK*8);
+  }
+  if (len - i > 0)
+    MDupdate(&MD, buf1+i, (len-i)*8);
 
   sum_put(&MD,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;
-  char *buf;
+  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;
@@ -96,43 +112,84 @@ 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);
   }
 
-  bcopy(map_ptr(buf,i,len-i),tmpchunk,len-i);
-  MDupdate(&MD, tmpchunk, (len-i)*8);
+  if (len - i > 0) {
+    memcpy(tmpchunk, map_ptr(buf,i,len-i), len-i);
+    MDupdate(&MD, tmpchunk, (len-i)*8);
+  }
 
   sum_put(&MD,sum);
 
   close(fd);
-  unmap_file(buf,size);
+  unmap_file(buf);
 }
 
 
 void checksum_init(void)
 {
-  tmpchunk = (char *)malloc(CSUM_CHUNK);
-  if (!tmpchunk) out_of_memory("checksum_init");
+  if (remote_version >= 14)
+    csum_length = 2; /* adaptive */
+  else
+    csum_length = SUM_LENGTH;
 }
 
 
-#ifdef CHECKSUM_MAIN
- int main(int argc,char *argv[])
+
+static MDstruct sumMD;
+static int sumresidue;
+static char sumrbuf[CSUM_CHUNK];
+
+void sum_init(void)
 {
-  char sum[SUM_LENGTH];
-  int i,j;
-
-  checksum_init();
-
-  for (i=1;i<argc;i++) {
-    struct stat st;
-    if (stat(argv[i],&st) == 0) {
-      file_checksum(argv[i],sum,st.st_size);
-      for (j=0;j<SUM_LENGTH;j++)
-	printf("%02X",(unsigned char)sum[j]);
-      printf("  %s\n",argv[i]);
-    }
+  char s[4];
+  MDbegin(&sumMD);  
+  sumresidue=0;
+  SIVAL(s,0,checksum_seed);
+  sum_update(s,4);
+}
+
+void sum_update(char *p,int len)
+{
+  int i;
+  if (len + sumresidue < CSUM_CHUNK) {
+    memcpy(sumrbuf+sumresidue, p, len);
+    sumresidue += len;
+    return;
+  }
+
+  if (sumresidue) {
+    i = MIN(CSUM_CHUNK-sumresidue,len);
+    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) {
+    memcpy(sumrbuf,p+i,CSUM_CHUNK);
+    MDupdate(&sumMD, sumrbuf, CSUM_CHUNK*8);
+  }
+
+  if (len - i > 0) {
+    sumresidue = len-i;
+    memcpy(sumrbuf,p+i,sumresidue);
+  } else {
+    sumresidue = 0;    
   }
 }
-#endif
+
+void sum_end(char *sum)
+{
+  if (sumresidue)
+    MDupdate(&sumMD, sumrbuf, sumresidue*8);
+
+  SIVAL(sum,0,sumMD.buffer[0]);
+  SIVAL(sum,4,sumMD.buffer[1]);
+  SIVAL(sum,8,sumMD.buffer[2]);
+  SIVAL(sum,12,sumMD.buffer[3]);  
+}
+
+