Updated to apply cleanly.

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

diff --git a/fuzzy.diff b/fuzzy.diff
index 69c0182..0bae7d3 100644 (file)
--- a/fuzzy.diff
+++ b/fuzzy.diff
@@ -12,8 +12,8 @@ test suite, but otherwise UNTESTED.]
 --
   Anyone who quotes me in their sig is an idiot. -- Rusty Russell.
 
---- Makefile.in        10 Feb 2004 17:06:11 -0000      1.98
-+++ Makefile.in        22 Apr 2004 23:48:20 -0000
+--- Makefile.in        2 May 2004 17:04:14 -0000       1.100
++++ Makefile.in        8 May 2004 18:41:35 -0000
 @@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
        zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
        zlib/zutil.o zlib/adler32.o
@@ -23,9 +23,9 @@ test suite, but otherwise UNTESTED.]
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
        fileio.o batch.o clientname.o
  OBJS3=progress.o pipe.o
---- generator.c        15 Apr 2004 16:55:23 -0000      1.79
-+++ generator.c        22 Apr 2004 23:48:20 -0000
-@@ -50,6 +50,7 @@ extern int list_only;
+--- generator.c        5 May 2004 17:15:03 -0000       1.81
++++ generator.c        8 May 2004 18:41:36 -0000
+@@ -51,6 +51,7 @@ extern int list_only;
  extern int only_existing;
  extern int orig_umask;
  extern int safe_symlinks;
@@ -33,7 +33,7 @@ test suite, but otherwise UNTESTED.]
  
  
  /* choose whether to skip a particular file */
-@@ -255,7 +256,62 @@ static void generate_and_send_sums(struc
+@@ -256,7 +257,62 @@ static void generate_and_send_sums(struc
        }
  }
  
@@ -96,7 +96,7 @@ test suite, but otherwise UNTESTED.]
  
  /**
   * Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -271,8 +327,6 @@ void recv_generator(char *fname, struct 
+@@ -272,8 +328,6 @@ void recv_generator(char *fname, struct 
        STRUCT_STAT st;
        struct map_struct *mapbuf;
        int statret;
@@ -105,7 +105,7 @@ test suite, but otherwise UNTESTED.]
  
        if (list_only)
                return;
-@@ -396,108 +450,38 @@ void recv_generator(char *fname, struct 
+@@ -397,108 +451,38 @@ void recv_generator(char *fname, struct 
        }
  #endif
  
@@ -234,7 +234,7 @@ test suite, but otherwise UNTESTED.]
                return;
        }
  
-@@ -507,7 +491,7 @@ void recv_generator(char *fname, struct 
+@@ -508,7 +492,7 @@ void recv_generator(char *fname, struct 
                mapbuf = NULL;
  
        if (verbose > 3) {
@@ -243,8 +243,8 @@ test suite, but otherwise UNTESTED.]
                        (double)st.st_size);
        }
  
---- options.c  17 Apr 2004 17:07:23 -0000      1.147
-+++ options.c  22 Apr 2004 23:48:20 -0000
+--- options.c  6 May 2004 21:08:01 -0000       1.148
++++ options.c  8 May 2004 18:41:36 -0000
 @@ -91,6 +91,7 @@ int ignore_errors = 0;
  int modify_window = 0;
  int blocking_io = -1;
@@ -258,9 +258,9 @@ test suite, but otherwise UNTESTED.]
    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,"     --fuzzy                 use similar file as basis if it does't exist\n");
-   rprintf(F," -h, --help                  show this help screen\n");
  #ifdef INET6
-   rprintf(F," -4                          prefer IPv4\n");
+   rprintf(F," -4  --ipv4                  prefer IPv4\n");
+   rprintf(F," -6  --ipv6                  prefer IPv6\n");
 @@ -385,6 +387,7 @@ static struct poptOption long_options[] 
    {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
    {"from0",           '0', POPT_ARG_NONE,   &eol_nulls, 0, 0, 0},
@@ -268,7 +268,7 @@ test suite, but otherwise UNTESTED.]
 +  {"fuzzy",            0,  POPT_ARG_NONE,   &fuzzy, 0, 0, 0 },
    {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
  #ifdef INET6
-   {0,               '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
+   {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
 @@ -964,6 +967,9 @@ void server_options(char **args,int *arg
                        args[ac++] = "--from0";
                }
@@ -279,8 +279,8 @@ test suite, but otherwise UNTESTED.]
  
        *argc = ac;
        return;
---- receiver.c 23 Mar 2004 16:50:40 -0000      1.75
-+++ receiver.c 22 Apr 2004 23:48:20 -0000
+--- receiver.c 27 Apr 2004 19:51:33 -0000      1.76
++++ receiver.c 8 May 2004 18:41:36 -0000
 @@ -45,6 +45,7 @@ extern int cleanup_got_literal;
  extern int module_id;
  extern int ignore_errors;