A couple parsing improvements and a new test case added to

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

diff --git a/md5.diff b/md5.diff
index 17f40da..8bbc974 100644 (file)
--- a/md5.diff
+++ b/md5.diff
@@ -1,4 +1,4 @@
---- orig/Makefile.in   2004-11-02 16:47:15
+--- orig/Makefile.in   2005-07-07 23:11:07
 +++ Makefile.in        2005-06-14 02:33:20
 @@ -26,7 +26,7 @@ VERSION=@VERSION@
  .SUFFIXES: .c .o
@@ -7,8 +7,8 @@
 -LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
 +LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \
        lib/permstring.o lib/pool_alloc.o @LIBOBJS@
- ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
-       zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
+ ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
+       zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
 --- orig/checksum.c    2005-01-01 21:08:05
 +++ checksum.c 2005-06-14 02:43:38
 @@ -18,6 +18,7 @@
@@ -551,8 +551,8 @@
 +void md5_finish(md5_context *ctx, uchar digest[16]);
 +
 +#endif /* md5.h */
---- orig/options.c     2005-05-19 08:52:42
-+++ options.c  2005-06-14 02:21:26
+--- orig/options.c     2005-08-27 21:11:26
++++ options.c  2005-08-27 21:23:04
 @@ -107,6 +107,7 @@ int inplace = 0;
  int delay_updates = 0;
  long block_size = 0; /* "long" because popt can't set an int32. */
@@ -569,15 +569,15 @@
  #ifdef INET6
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
-@@ -460,6 +462,7 @@ static struct poptOption long_options[] 
-   {"no-implied-dirs",  0,  POPT_ARG_VAL,    &implied_dirs, 0, 0, 0 },
-   {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
-   {"checksum-seed",    0,  POPT_ARG_INT,    &checksum_seed, 0, 0, 0 },
+@@ -441,6 +443,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 },
 +  {"md5",              0,  POPT_ARG_NONE,   &use_md5, 0, 0, 0 },
- #ifdef INET6
-   {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
-   {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
-@@ -1365,6 +1368,9 @@ void server_options(char **args,int *arg
+   {"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 },
+@@ -1412,6 +1415,9 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }