Fixed some build problems that crept into the code.

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

diff --git a/md5.diff b/md5.diff
index 08c85bc..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;
@@ -563,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");
@@ -579,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 },
@@ -587,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 },
-@@ -1643,6 +1646,9 @@ void server_options(char **args,int *arg
+@@ -1656,6 +1659,9 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }