Updated to apply cleanly.

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

diff --git a/fuzzy.diff b/fuzzy.diff
index 5c8bf4b..2790312 100644 (file)
--- a/fuzzy.diff
+++ b/fuzzy.diff
@@ -6,7 +6,7 @@ Very lightly tested.
 
 Be sure to run "make proto" before "make".
 
---- orig/generator.c   2004-09-07 21:55:02
+--- orig/generator.c   2004-09-20 19:57:58
 +++ generator.c        2004-07-30 18:11:15
 @@ -43,6 +43,7 @@ extern int ignore_times;
  extern int size_only;
@@ -176,7 +176,7 @@ Be sure to run "make proto" before "make".
  
        /* The receiving side mustn't obey this, or an existing symlink that
         * points to an identical file won't be replaced by the referent. */
---- orig/options.c     2004-09-07 21:45:30
+--- orig/options.c     2004-09-20 05:10:48
 +++ options.c  2004-07-16 20:14:12
 @@ -85,6 +85,7 @@ int safe_symlinks = 0;
  int copy_unsafe_links = 0;
@@ -202,7 +202,7 @@ Be sure to run "make proto" before "make".
    /* TODO: Should this take an optional int giving the compression level? */
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
    {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
-@@ -1092,6 +1095,9 @@ void server_options(char **args,int *arg
+@@ -1095,6 +1098,9 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -214,7 +214,7 @@ Be sure to run "make proto" before "make".
  
 --- orig/receiver.c    2004-09-07 21:57:20
 +++ receiver.c 2004-07-30 18:21:38
-@@ -323,6 +323,27 @@ static int receive_data(int f_in, char *
+@@ -319,6 +319,27 @@ static int receive_data(int f_in, char *
  }
  
  
@@ -242,7 +242,7 @@ Be sure to run "make proto" before "make".
  static void discard_receive_data(int f_in, OFF_T length)
  {
        receive_data(f_in, NULL, -1, 0, NULL, -1, length);
-@@ -452,6 +473,10 @@ int recv_files(int f_in, struct file_lis
+@@ -448,6 +469,10 @@ int recv_files(int f_in, struct file_lis
                        case G2R_BACKUP:
                                fnamecmp = get_backup_name(fname);
                                break;
@@ -263,7 +263,7 @@ Be sure to run "make proto" before "make".
  
  
  /* Log-message categories.  FLOG is only used on the daemon side to
---- orig/rsync.yo      2004-09-07 19:54:51
+--- orig/rsync.yo      2004-09-20 05:10:48
 +++ rsync.yo   2004-07-03 19:27:25
 @@ -356,6 +356,7 @@ verb(
   -T  --temp-dir=DIR          create temporary files in directory DIR