Updated to apply cleanly.

[rsync/rsync-patches.git] / checksum-seed.diff

diff --git a/checksum-seed.diff b/checksum-seed.diff
index 6847c26..2ec4662 100644 (file)
--- a/checksum-seed.diff
+++ b/checksum-seed.diff
@@ -1,47 +1,49 @@
---- options.c  2004-04-17 10:07:23.000000000 -0700
-+++ options.c  2004-05-01 16:24:44.380672000 -0700
-@@ -290,6 +290,7 @@
+--- options.c  6 May 2004 21:08:01 -0000       1.148
++++ options.c  8 May 2004 18:32:36 -0000
+@@ -290,6 +290,7 @@ void usage(enum logcode F)
    rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth, KBytes per second\n");
    rprintf(F,"     --write-batch=PREFIX    write batch fileset starting with PREFIX\n");
    rprintf(F,"     --read-batch=PREFIX     read batch fileset starting with PREFIX\n");
 +  rprintf(F,"     --checksum-seed=NUM     set block/file checksum seed\n");
-   rprintf(F," -h, --help                  show this help screen\n");
  #ifdef INET6
-   rprintf(F," -4                          prefer IPv4\n");
-@@ -386,6 +387,7 @@
+   rprintf(F," -4  --ipv4                  prefer IPv4\n");
+   rprintf(F," -6  --ipv6                  prefer IPv6\n");
+@@ -386,6 +387,7 @@ static struct poptOption long_options[] 
    {"from0",           '0', POPT_ARG_NONE,   &eol_nulls, 0, 0, 0},
    {"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 },
  #ifdef INET6
-   {0,               '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
-   {0,               '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
-@@ -911,6 +913,11 @@
-                       goto oom;
-               args[ac++] = arg;
-       }
-+      if (checksum_seed) {
-+              if (asprintf(&arg, "--checksum_seed=%d", checksum_seed) < 0)
+   {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
+   {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
+@@ -908,6 +910,12 @@ void server_options(char **args,int *arg
+ 
+       if (modify_window_set) {
+               if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
 +                      goto oom;
 +              args[ac++] = arg;
 +      }
- 
-       if (keep_partial)
-               args[ac++] = "--partial";
---- rsync.yo   2004-04-30 11:02:43.000000000 -0700
-+++ rsync.yo   2004-05-01 16:59:48.546313600 -0700
-@@ -348,6 +348,7 @@
++
++      if (checksum_seed) {
++              if (asprintf(&arg, "--checksum_seed=%d", checksum_seed) < 0)
+                       goto oom;
+               args[ac++] = arg;
+       }
+--- rsync.yo   7 May 2004 00:18:37 -0000       1.169
++++ rsync.yo   8 May 2004 18:32:36 -0000
+@@ -348,6 +348,7 @@ verb(
       --bwlimit=KBPS          limit I/O bandwidth, KBytes per second
       --write-batch=PREFIX    write batch fileset starting with PREFIX
       --read-batch=PREFIX     read batch fileset starting with PREFIX
 +     --checksum-seed=NUM     set block/file checksum seed
+  -4  --ipv4                  prefer IPv4
+  -6  --ipv6                  prefer IPv6
   -h, --help                  show this help screen
- 
- 
-@@ -897,6 +898,20 @@
- using the fileset whose filenames start with PREFIX. See the "BATCH
- MODE" section for details.
- 
+@@ -907,6 +908,20 @@ listen for connections.  One of these op
+ versions of Linux to work around an IPv6 bug in the kernel (if you see
+ an "address already in use" error when nothing else is using the port,
+ try specifying --ipv6 or --ipv4 when starting the daemon).
++
 +dit(bf(--checksum-seed=NUM)) Set the MD4 checksum seed to the integer
 +NUM.  This 4 byte checksum seed is included in each block and file
 +MD4 checksum calculation.  By default the checksum seed is generated
@@ -55,7 +57,6 @@
 +set the checksum seed to 32761, so --checksum-seed=NUM needs to
 +follow these options if you want to specify a different checksum
 +seed in batch mode.
-+
+ 
  enddit()
  
- manpagesection(EXCLUDE PATTERNS)