Fixed a couple compile problems.

[rsync/rsync-patches.git] / md5.diff

diff --git a/md5.diff b/md5.diff
index c8d339c..4f4254a 100644 (file)
--- a/md5.diff
+++ b/md5.diff
@@ -26,9 +26,9 @@ To use this patch, run these commands for a successful build:
  #include "rsync.h"
 +#include "lib/md5.h"
  
- int csum_length=2; /* initial value */
+ int csum_length = SHORT_SUM_LENGTH; /* initial value */
  
-@@ -28,6 +29,7 @@ int csum_length=2; /* initial value */
+@@ -28,6 +29,7 @@ int csum_length = SHORT_SUM_LENGTH; /* i
  
  extern int checksum_seed;
  extern int protocol_version;
@@ -87,15 +87,15 @@ To use this patch, run these commands for a successful build:
  }
  
  
-@@ -100,6 +115,7 @@ void file_checksum(char *fname,char *sum
-       int fd;
-       OFF_T len = size;
+@@ -99,6 +114,7 @@ void file_checksum(char *fname,char *sum
+       OFF_T i, len = size;
        struct mdfour m;
+       int32 remainder;
 +      md5_context ctx;
+       int fd;
  
        memset(sum,0,MD4_SUM_LENGTH);
- 
-@@ -109,21 +125,36 @@ void file_checksum(char *fname,char *sum
+@@ -109,11 +125,19 @@ void file_checksum(char *fname,char *sum
  
        buf = map_file(fd, size, MAX_MAP_SIZE, CSUM_CHUNK);
  
@@ -118,16 +118,17 @@ To use this patch, run these commands for a successful build:
        }
  
        /* Prior to version 27 an incorrect MD4 checksum was computed
-        * by failing to call mdfour_tail() for block sizes that
+@@ -121,10 +145,17 @@ void file_checksum(char *fname,char *sum
         * are multiples of 64.  This is fixed by calling mdfour_update()
         * even when there are no more bytes. */
--      if (len - i > 0 || protocol_version >= 27)
--              mdfour_update(&m, (uchar *)map_ptr(buf, i, len-i), len-i);
-+      if (len - i > 0 || protocol_version >= 27) {
+       remainder = (int32)(len - i);
+-      if (remainder > 0 || protocol_version >= 27)
+-              mdfour_update(&m, (uchar *)map_ptr(buf, i, remainder), remainder);
++      if (remainder > 0 || protocol_version >= 27) {
 +              if (use_md5)
-+                      md5_update(&ctx, (uchar *)map_ptr(buf, i, len-i), len-i);
++                      md5_update(&ctx, (uchar *)map_ptr(buf, i, remainder), remainder);
 +              else
-+                      mdfour_update(&m, (uchar *)map_ptr(buf, i, len-i), len-i);
++                      mdfour_update(&m, (uchar *)map_ptr(buf, i, remainder), remainder);
 +      }
  
 -      mdfour_result(&m, (uchar *)sum);
@@ -138,7 +139,7 @@ To use this patch, run these commands for a successful build:
  
        close(fd);
        unmap_file(buf);
-@@ -133,11 +164,15 @@ void file_checksum(char *fname,char *sum
+@@ -134,11 +165,15 @@ void file_checksum(char *fname,char *sum
  static int32 sumresidue;
  static char sumrbuf[CSUM_CHUNK];
  static struct mdfour md;
@@ -155,7 +156,7 @@ To use this patch, run these commands for a successful build:
        sumresidue = 0;
        SIVAL(s, 0, seed);
        sum_update(s, 4);
-@@ -162,13 +197,19 @@ void sum_update(char *p, int32 len)
+@@ -163,13 +198,19 @@ void sum_update(const char *p, int32 len
        if (sumresidue) {
                int32 i = CSUM_CHUNK - sumresidue;
                memcpy(sumrbuf + sumresidue, p, i);
@@ -177,7 +178,7 @@ To use this patch, run these commands for a successful build:
                len -= CSUM_CHUNK;
                p += CSUM_CHUNK;
        }
-@@ -180,8 +221,15 @@ void sum_update(char *p, int32 len)
+@@ -181,8 +222,15 @@ void sum_update(const char *p, int32 len
  
  void sum_end(char *sum)
  {
@@ -562,15 +563,15 @@ To use this patch, run these commands for a successful build:
 +#endif /* md5.h */
 --- old/options.c
 +++ new/options.c
-@@ -117,6 +117,7 @@ int inplace = 0;
- int delay_updates = 0;
- long block_size = 0; /* "long" because popt can't set an int32. */
- 
+@@ -101,6 +101,7 @@ int copy_unsafe_links = 0;
+ int size_only = 0;
+ int daemon_bwlimit = 0;
+ int bwlimit = 0;
 +int use_md5 = 0;
- 
- /** Network address family. **/
- #ifdef INET6
-@@ -381,6 +382,7 @@ void usage(enum logcode F)
+ int fuzzy_basis = 0;
+ size_t bwlimit_writemax = 0;
+ int ignore_existing = 0;
+@@ -378,6 +379,7 @@ void usage(enum logcode F)
    rprintf(F,"     --only-write-batch=FILE like --write-batch but w/o updating destination\n");
    rprintf(F,"     --read-batch=FILE       read a batched update from FILE\n");
    rprintf(F,"     --protocol=NUM          force an older protocol version to be used\n");
@@ -578,7 +579,7 @@ To use this patch, run these commands for a successful build:
  #ifdef INET6
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
-@@ -494,6 +496,7 @@ static struct poptOption long_options[] 
+@@ -492,6 +494,7 @@ static struct poptOption long_options[] 
    {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },
    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
    {"no-W",             0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
@@ -586,7 +587,7 @@ To use this patch, run these commands for a successful build:
    {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
    {"block-size",      'B', POPT_ARG_LONG,   &block_size, 0, 0, 0 },
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
-@@ -1642,6 +1645,9 @@ void server_options(char **args,int *arg
+@@ -1656,6 +1659,9 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }