From: Wayne Davison <wayned@samba.org>
Date: Sat, 15 Jan 2005 21:36:05 +0000 (+0000)
Subject: Fixed a failing hunk.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/9cf86680f21af79fad899f673223b723cdf2d637

Fixed a failing hunk.
---

diff --git a/fuzzy.diff b/fuzzy.diff
index 82ee022..47e28a9 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-14 18:30:18
-+++ generator.c	2004-11-27 18:12:57
+--- orig/generator.c	2005-01-15 21:18:09
++++ generator.c	2005-01-15 21:20:10
 @@ -44,6 +44,7 @@ extern int size_only;
  extern OFF_T max_size;
  extern int io_timeout;
@@ -123,7 +123,7 @@ Be sure to run "make proto" before "make".
  			return;
 @@ -521,6 +615,8 @@ static void recv_generator(char *fname, 
  
- 	if ((link_dest || copy_dest) && fnamecmp_type != FNAMECMP_FNAME)
+ 	if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
  		;
 +	else if (fnamecmp_type == FNAMECMP_FUZZY)
 +		;
@@ -176,8 +176,8 @@ 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-15 20:26:21
-+++ options.c	2004-11-29 01:36:48
+--- orig/options.c	2005-01-15 21:23:15
++++ options.c	2005-01-15 21:08:13
 @@ -86,6 +86,7 @@ int copy_unsafe_links = 0;
  int size_only = 0;
  int daemon_bwlimit = 0;
@@ -225,9 +225,9 @@ Be sure to run "make proto" before "make".
  	*argc = ac;
  	return;
  
---- orig/receiver.c	2005-01-10 09:46:01
-+++ receiver.c	2004-11-27 18:15:01
-@@ -323,6 +323,27 @@ static int receive_data(int f_in, char *
+--- orig/receiver.c	2005-01-15 21:18:09
++++ receiver.c	2005-01-15 21:21:02
+@@ -324,6 +324,27 @@ static int receive_data(int f_in, char *
  }
  
  
@@ -255,7 +255,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);
-@@ -453,6 +474,10 @@ int recv_files(int f_in, struct file_lis
+@@ -454,6 +475,10 @@ int recv_files(int f_in, struct file_lis
  			case FNAMECMP_BACKUP:
  				fnamecmp = get_backup_name(fname);
  				break;
@@ -263,12 +263,12 @@ Be sure to run "make proto" before "make".
 +				read_gen_name(f_in_name, fnamecmpbuf);
 +				fnamecmp = fnamecmpbuf;
 +				break;
- 			case FNAMECMP_BASIS_DIR:
  			default:
- 				pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
---- orig/rsync.h	2005-01-10 00:21:12
-+++ rsync.h	2004-11-03 22:53:09
-@@ -125,6 +125,7 @@
+ 				if (j >= basis_dir_cnt) {
+ 					rprintf(FERROR,
+--- orig/rsync.h	2005-01-15 21:18:09
++++ rsync.h	2005-01-15 21:24:09
+@@ -127,6 +127,7 @@
  #define FNAMECMP_FNAME		0x80
  #define FNAMECMP_PARTIAL_DIR	0x81
  #define FNAMECMP_BACKUP 	0x82