X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/d1cfcd415f677c56430bff609fbd6a6086b11f0e..a7219d2067fb9923061cfe7da56477d85e03d51a:/fuzzy.diff

diff --git a/fuzzy.diff b/fuzzy.diff
index 2aecf46..9ce20dc 100644
--- a/fuzzy.diff
+++ b/fuzzy.diff
@@ -4,8 +4,8 @@ Lightly tested.
 
 Be sure to run "make proto" before "make".
 
---- orig/generator.c	2005-01-25 12:14:14
-+++ generator.c	2005-01-19 18:39:15
+--- orig/generator.c	2005-02-03 02:04:20
++++ generator.c	2005-02-03 02:11:10
 @@ -47,6 +47,7 @@ extern int size_only;
  extern OFF_T max_size;
  extern int io_timeout;
@@ -101,9 +101,9 @@ Be sure to run "make proto" before "make".
 +}
 +
  
- /*
-  * Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -479,6 +562,15 @@ static void recv_generator(char *fname, 
+ /* Acts on flist->file's ndx'th item, whose name is fname.  If a directory,
+  * make sure it exists, and has the right permissions/timestamp info.  For
+@@ -477,6 +560,15 @@ static void recv_generator(char *fname, 
  	} else
  		partialptr = NULL;
  
@@ -119,7 +119,7 @@ Be sure to run "make proto" before "make".
  	if (statret == -1) {
  		if (preserve_hard_links && hard_link_check(file, HL_SKIP))
  			return;
-@@ -507,6 +599,8 @@ static void recv_generator(char *fname, 
+@@ -505,6 +597,8 @@ static void recv_generator(char *fname, 
  
  	if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
  		;
@@ -128,8 +128,8 @@ Be sure to run "make proto" before "make".
  	else if (unchanged_file(fnamecmp, file, &st)) {
  		if (fnamecmp_type == FNAMECMP_FNAME)
  			set_perms(fname, file, &st, PERMS_REPORT);
-@@ -581,8 +675,24 @@ notify_others:
- 	write_int(f_out, i);
+@@ -579,8 +673,24 @@ notify_others:
+ 	write_int(f_out, ndx);
  	if (protocol_version >= 29 && inplace && !read_batch)
  		write_byte(f_out, fnamecmp_type);
 -	if (f_out_name >= 0)
@@ -154,9 +154,9 @@ Be sure to run "make proto" before "make".
  
  	if (dry_run || read_batch)
  		return;
---- orig/main.c	2005-01-28 19:08:20
+--- orig/main.c	2005-01-30 10:07:21
 +++ main.c	2005-01-14 18:33:15
-@@ -49,6 +49,7 @@ extern int keep_dirlinks;
+@@ -48,6 +48,7 @@ extern int keep_dirlinks;
  extern int preserve_hard_links;
  extern int protocol_version;
  extern int recurse;
@@ -164,7 +164,7 @@ Be sure to run "make proto" before "make".
  extern int relative_paths;
  extern int rsync_port;
  extern int whole_file;
-@@ -485,7 +486,8 @@ static int do_recv(int f_in,int f_out,st
+@@ -491,7 +492,8 @@ static int do_recv(int f_in,int f_out,st
  	int pid;
  	int status = 0;
  	int error_pipe[2], name_pipe[2];
@@ -174,7 +174,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	2005-01-28 19:08:20
+--- orig/options.c	2005-02-01 10:39:22
 +++ options.c	2005-01-28 19:31:20
 @@ -90,6 +90,7 @@ int copy_unsafe_links = 0;
  int size_only = 0;
@@ -200,7 +200,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 },
    {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
-@@ -1315,6 +1318,9 @@ void server_options(char **args,int *arg
+@@ -1321,6 +1324,9 @@ void server_options(char **args,int *arg
  	if (!implied_dirs && !am_sender)
  		args[ac++] = "--no-implied-dirs";
  
@@ -210,9 +210,9 @@ Be sure to run "make proto" before "make".
  	*argc = ac;
  	return;
  
---- orig/receiver.c	2005-01-28 19:08:20
+--- orig/receiver.c	2005-02-03 02:04:20
 +++ receiver.c	2005-01-15 21:21:02
-@@ -252,6 +252,27 @@ static int receive_data(int f_in, char *
+@@ -256,6 +256,27 @@ static int receive_data(int f_in, char *
  }
  
  
@@ -240,7 +240,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);
-@@ -390,6 +411,10 @@ int recv_files(int f_in, struct file_lis
+@@ -395,6 +416,10 @@ int recv_files(int f_in, struct file_lis
  			case FNAMECMP_BACKUP:
  				fnamecmp = get_backup_name(fname);
  				break;
@@ -251,9 +251,9 @@ Be sure to run "make proto" before "make".
  			default:
  				if (j >= basis_dir_cnt) {
  					rprintf(FERROR,
---- orig/rsync.h	2005-01-28 19:08:20
+--- orig/rsync.h	2005-02-03 02:04:20
 +++ rsync.h	2005-01-19 18:36:47
-@@ -130,6 +130,7 @@
+@@ -131,6 +131,7 @@
  #define FNAMECMP_FNAME		0x80
  #define FNAMECMP_PARTIAL_DIR	0x81
  #define FNAMECMP_BACKUP 	0x82
@@ -261,9 +261,9 @@ Be sure to run "make proto" before "make".
  
  /* For calling delete_file() */
  #define DEL_DIR 		(1<<0)
---- orig/rsync.yo	2005-01-28 17:12:14
+--- orig/rsync.yo	2005-02-01 10:39:23
 +++ rsync.yo	2005-01-28 19:31:36
-@@ -365,6 +365,7 @@ verb(
+@@ -354,6 +354,7 @@ to the detailed description below for a 
       --compare-dest=DIR      also compare received files relative to DIR
       --copy-dest=DIR         ... and include copies of unchanged files
       --link-dest=DIR         hardlink to files in DIR when unchanged
@@ -271,8 +271,8 @@ Be sure to run "make proto" before "make".
   -z, --compress              compress file data
   -C, --cvs-exclude           auto-ignore files in the same way CVS does
   -f, --filter=RULE           add a file-filtering RULE
-@@ -949,6 +950,14 @@ Note that rsync versions prior to 2.6.1 
- (or implied by -a).  You can work-around this bug by avoiding the -o option
+@@ -937,6 +938,14 @@ bf(--link-dest) from working properly fo
+ (or implied by bf(-a)).  You can work-around this bug by avoiding the bf(-o) option
  when sending to an old rsync.
  
 +dit(bf(--fuzzy)) This option tells rsync that it should look around for a