Updated to apply over the latest g2r-basis-filename.diff patch.

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

diff --git a/fuzzy.diff b/fuzzy.diff
index 7280752..bce2230 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-07-03 20:08:07
+--- orig/generator.c   2004-07-17 15:50:09
 +++ generator.c        2004-07-03 20:09:05
 @@ -41,6 +41,7 @@ extern int ignore_times;
  extern int size_only;
@@ -112,15 +112,15 @@ Be sure to run "make proto" before "make".
  /*
   * Acts on file number @p i from @p flist, whose name is @p fname.
 @@ -256,7 +345,7 @@ static void recv_generator(char *fname, 
-       int fd;
+       int fd = -1;
        STRUCT_STAT st;
-       struct map_struct *mapbuf;
+       struct map_struct *mapbuf = NULL;
 -      int statret;
 +      int statret, fuzzy_file = 0;
        char *fnamecmp;
        char fnamecmpbuf[MAXPATHLEN];
  
-@@ -439,6 +528,14 @@ static void recv_generator(char *fname, 
+@@ -436,6 +525,14 @@ static void recv_generator(char *fname, 
        } else
                *fnamecmpbuf = '\0';
  
@@ -135,7 +135,7 @@ Be sure to run "make proto" before "make".
        if (statret == -1) {
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;
-@@ -485,7 +582,7 @@ static void recv_generator(char *fname, 
+@@ -473,7 +570,7 @@ static void recv_generator(char *fname, 
                return;
        }
  
@@ -144,6 +144,25 @@ Be sure to run "make proto" before "make".
                if (!*fnamecmpbuf)
                        set_perms(fname, file, &st, PERMS_REPORT);
                return;
+--- orig/main.c        2004-07-17 15:58:11
++++ main.c     2004-07-17 16:32:39
+@@ -47,6 +47,7 @@ extern int keep_dirlinks;
+ extern int preserve_hard_links;
+ extern int protocol_version;
+ extern int recurse;
++extern int fuzzy;
+ extern int relative_paths;
+ extern int rsync_port;
+ extern int whole_file;
+@@ -446,7 +447,7 @@ static int do_recv(int f_in,int f_out,st
+       int pid;
+       int status = 0;
+       int error_pipe[2], name_pipe[2];
+-      int need_name_pipe = compare_dest || read_batch;
++      int need_name_pipe = compare_dest || fuzzy || read_batch;
+ 
+       if (preserve_hard_links)
+               init_hard_links(flist);
 --- orig/options.c     2004-07-16 20:07:22
 +++ options.c  2004-07-16 20:14:12
 @@ -85,6 +85,7 @@ int safe_symlinks = 0;
@@ -180,9 +199,9 @@ Be sure to run "make proto" before "make".
        *argc = ac;
        return;
  
---- orig/receiver.c    2004-07-03 20:08:07
+--- orig/receiver.c    2004-07-17 21:27:55
 +++ receiver.c 2004-07-03 20:09:05
-@@ -36,7 +36,6 @@ extern int preserve_perms;
+@@ -37,7 +37,6 @@ extern int preserve_perms;
  extern int cvs_exclude;
  extern int io_error;
  extern char *tmpdir;
@@ -190,7 +209,7 @@ Be sure to run "make proto" before "make".
  extern int make_backups;
  extern int do_progress;
  extern char *backup_dir;
---- orig/rsync.yo      2004-07-16 20:07:23
+--- orig/rsync.yo      2004-07-19 08:27:29
 +++ rsync.yo   2004-07-03 19:27:25
 @@ -326,6 +326,7 @@ verb(
   -T  --temp-dir=DIR          create temporary files in directory DIR