From 3eabe3a3a9d8269663ffb38f30b82841a3b8fc36 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 14 Jan 2005 18:34:18 +0000 Subject: [PATCH] Fixed a failing hunk. --- fuzzy.diff | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fuzzy.diff b/fuzzy.diff index 828575c..895ada6 100644 --- a/fuzzy.diff +++ b/fuzzy.diff @@ -4,7 +4,7 @@ Lightly tested. Be sure to run "make proto" before "make". ---- orig/generator.c 2005-01-01 21:11:00 +--- orig/generator.c 2005-01-14 18:30:18 +++ generator.c 2004-11-27 18:12:57 @@ -44,6 +44,7 @@ extern int size_only; extern OFF_T max_size; @@ -132,7 +132,7 @@ 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); -@@ -592,8 +690,24 @@ prepare_to_open: +@@ -593,8 +691,24 @@ prepare_to_open: notify_others: write_int(f_out, i); @@ -158,8 +158,8 @@ Be sure to run "make proto" before "make". if (dry_run || read_batch) return; ---- orig/main.c 2005-01-01 21:11:00 -+++ main.c 2004-11-27 18:13:51 +--- orig/main.c 2005-01-14 18:30:18 ++++ main.c 2005-01-14 18:33:15 @@ -48,6 +48,7 @@ extern int keep_dirlinks; extern int preserve_hard_links; extern int protocol_version; @@ -168,12 +168,13 @@ Be sure to run "make proto" before "make". extern int relative_paths; extern int rsync_port; extern int whole_file; -@@ -463,7 +464,7 @@ static int do_recv(int f_in,int f_out,st +@@ -464,7 +465,8 @@ static int do_recv(int f_in,int f_out,st int pid; int status = 0; int error_pipe[2], name_pipe[2]; -- BOOL need_name_pipe = basis_dir[0] && !dry_run; -+ BOOL need_name_pipe = (basis_dir[0] || fuzzy_basis) && !dry_run; +- BOOL need_name_pipe = (basis_dir[0] || partial_dir) && !dry_run; ++ BOOL need_name_pipe = (basis_dir[0] || partial_dir || fuzzy_basis) ++ && !dry_run; /* The receiving side mustn't obey this, or an existing symlink that * points to an identical file won't be replaced by the referent. */ @@ -226,7 +227,7 @@ Be sure to run "make proto" before "make". *argc = ac; return; ---- orig/receiver.c 2005-01-01 21:11:00 +--- 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 * } @@ -267,7 +268,7 @@ Be sure to run "make proto" before "make". case FNAMECMP_BASIS_DIR: default: pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, ---- orig/rsync.h 2005-01-01 21:11:01 +--- orig/rsync.h 2005-01-10 00:21:12 +++ rsync.h 2004-11-03 22:53:09 @@ -125,6 +125,7 @@ #define FNAMECMP_FNAME 0x80 -- 2.34.1