X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/241013b4fc9bf65aea632cda139241017c7db0d6..0f6260347bf6c29859ed4808f04222f84c2a8817:/fuzzy.diff diff --git a/fuzzy.diff b/fuzzy.diff index 2d7b88e..73d6b74 100644 --- a/fuzzy.diff +++ b/fuzzy.diff @@ -1,93 +1,24 @@ -From rusty@rustcorp.com.au Wed Apr 3 17:18:42 2002 -Return-Path: -Delivered-To: mbp@samba.org -Received: from wagner.rustcorp.com.au (sydney1.au.ibm.com [202.135.142.193]) - by lists.samba.org (Postfix) with ESMTP id EA7B849DC - for ; Tue, 2 Apr 2002 23:06:29 -0800 (PST) -Received: from wagner.rustcorp.com.au ([127.0.0.1] helo=rustcorp.com.au) - by wagner.rustcorp.com.au with esmtp (Exim 3.35 #1 (Debian)) - id 16set7-0000pL-00 - for ; Wed, 03 Apr 2002 17:08:57 +1000 -From: Rusty Russell -To: Martin Pool -Subject: Re: gzip patch -In-reply-to: Your message of "Wed, 03 Apr 2002 12:04:59 +1000." - <20020403020455.GC18851@samba.org> -Date: Wed, 03 Apr 2002 17:08:57 +1000 -Sender: rusty@rustcorp.com.au -Message-Id: -Status: RO -X-Status: A -Content-Length: 12810 -Lines: 461 +The changes to generator.c were greatly simplified, making the patch +easier to maintain and fixing the failing test in the testsuite. +Lightly tested. -In message <20020403020455.GC18851@samba.org> you write: -> Hi, -> -> I think you said the other day that you had a working --rsyncable -> patch for gzip. Could I have it please? +Be sure to run "make proto" before "make". -Hi Martin, - - Just got your mail, sorry for the delay. Found old patch on -google, and updated it for 2.5.4 (I know, but that's what apt-get -source gave me). - -Compiles, otherwise untested. -Rusty. --- - Anyone who quotes me in their sig is an idiot. -- Rusty Russell. - -diff -urN rsync-2.5.4/Makefile.in rsync-2.5.4-fuzzy/Makefile.in ---- rsync-2.5.4/Makefile.in Tue Feb 26 05:48:25 2002 -+++ rsync-2.5.4-fuzzy/Makefile.in Wed Apr 3 16:35:55 2002 -@@ -28,7 +28,7 @@ - ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \ - zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \ - zlib/zutil.o zlib/adler32.o --OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o main.o checksum.o match.o syscall.o log.o backup.o -+OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o main.o checksum.o match.o syscall.o log.o backup.o alternate.o - OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o fileio.o batch.o \ - clientname.o - DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o -diff -urN rsync-2.5.4/alternate.c rsync-2.5.4-fuzzy/alternate.c ---- rsync-2.5.4/alternate.c Thu Jan 1 10:00:00 1970 -+++ rsync-2.5.4-fuzzy/alternate.c Wed Apr 3 17:04:15 2002 -@@ -0,0 +1,117 @@ -+#include "rsync.h" -+ -+extern char *compare_dest; -+extern int verbose; -+ -+/* Alternate methods for opening files, if local doesn't exist */ -+/* Sanity check that we are about to open regular file */ -+int do_open_regular(char *fname) -+{ -+ STRUCT_STAT st; -+ -+ if (do_stat(fname, &st) == 0 && S_ISREG(st.st_mode)) -+ return do_open(fname, O_RDONLY, 0); -+ -+ return -1; -+} -+ -+static void split_names(char *fname, char **dirname, char **basename) -+{ -+ char *slash; -+ -+ slash = strrchr(fname, '/'); -+ if (slash) { -+ *dirname = fname; -+ *slash = '\0'; -+ *basename = slash+1; -+ } else { -+ *basename = fname; -+ *dirname = "."; -+ } -+} -+ -+static unsigned int measure_name(const char *name, -+ const char *basename, +--- orig/generator.c 2005-01-17 23:11:45 ++++ generator.c 2005-01-16 02:16:38 +@@ -44,6 +44,7 @@ extern int size_only; + extern OFF_T max_size; + extern int io_timeout; + extern int protocol_version; ++extern int fuzzy_basis; + extern int always_checksum; + extern char *partial_dir; + extern char *basis_dir[]; +@@ -242,6 +243,83 @@ static void generate_and_send_sums(int f + } + + ++static unsigned int measure_name(const char *name, const char *basename, + const char *ext) +{ + int namelen = strlen(name); @@ -95,55 +26,60 @@ diff -urN rsync-2.5.4/alternate.c rsync-2.5.4-fuzzy/alternate.c + unsigned int score = 0; + + /* Extensions must match */ -+ if (namelen <= extlen || strcmp(name+namelen-extlen, ext) != 0) ++ if (namelen <= extlen || strcmp(name + namelen - extlen, ext) != 0) + return 0; + + /* Now score depends on similarity of prefix */ -+ for (; *name==*basename && *name; name++, basename++) ++ for (; *name == *basename && *name; name++, basename++) + score++; + return score; +} + -+int open_alternate_base_fuzzy(const char *fname) ++ ++static int find_fuzzy(const char *fname, char *buf, STRUCT_STAT *st_ptr) +{ + DIR *d; + struct dirent *di; -+ char *basename, *dirname; -+ char mangled_name[MAXPATHLEN]; ++ char *basename, *dirname, *slash; + char bestname[MAXPATHLEN]; + unsigned int bestscore = 0; + const char *ext; + -+ /* FIXME: can we assume fname fits here? */ -+ strcpy(mangled_name, fname); ++ strlcpy(buf, fname, MAXPATHLEN); ++ if ((slash = strrchr(buf, '/')) != NULL) { ++ dirname = buf; ++ *slash = '\0'; ++ basename = slash + 1; ++ } else { ++ basename = buf; ++ dirname = "."; ++ } + -+ split_names(mangled_name, &dirname, &basename); -+ d = opendir(dirname); -+ if (!d) { -+ rprintf(FERROR,"recv_generator opendir(%s): %s\n", -+ dirname,strerror(errno)); ++ if (!(d = opendir(dirname))) { ++ rsyserr(FERROR, errno, "recv_generator opendir(%s)", dirname); + return -1; + } + + /* Get final extension, eg. .gz; never full basename though. */ -+ ext = strrchr(basename + 1, '.'); -+ if (!ext) ++ for (ext = basename; *ext == '.'; ext++) {} ++ if (!(ext = strrchr(ext, '.'))) + ext = basename + strlen(basename); /* ext = "" */ + + while ((di = readdir(d)) != NULL) { + const char *dname = d_name(di); + unsigned int score; + -+ if (strcmp(dname,".")==0 || -+ strcmp(dname,"..")==0) ++ if (dname[0] == '.' && (dname[1] == '\0' ++ || (dname[1] == '.' && dname[2] == '\0'))) + continue; -+ ++ + score = measure_name(dname, basename, ext); -+ if (verbose > 4) -+ rprintf(FINFO,"fuzzy score for %s = %u\n", ++ if (verbose > 4) { ++ rprintf(FINFO, "fuzzy score for %s = %u\n", + dname, score); ++ } + if (score > bestscore) { -+ strcpy(bestname, dname); ++ strlcpy(bestname, dname, sizeof bestname); + bestscore = score; + } + } @@ -151,335 +87,194 @@ diff -urN rsync-2.5.4/alternate.c rsync-2.5.4-fuzzy/alternate.c + + /* Found a candidate. */ + if (bestscore != 0) { -+ char fuzzyname[MAXPATHLEN]; -+ -+ snprintf(fuzzyname,MAXPATHLEN,"%s/%s", dirname, bestname); ++ strlcpy(basename, MAXPATHLEN - (basename - buf), bestname); + if (verbose > 2) -+ rprintf(FINFO,"fuzzy match %s->%s\n", -+ fname, fuzzyname); -+ return do_open_regular(fuzzyname); ++ rprintf(FINFO, "fuzzy match %s->%s\n", fname, buf); ++ return link_stat(buf, st_ptr, 0); + } + return -1; +} + -+int open_alternate_base_comparedir(const char *fname) -+{ -+ char fnamebuf[MAXPATHLEN]; -+ /* try the file at compare_dest instead */ -+ snprintf(fnamebuf,MAXPATHLEN,"%s/%s",compare_dest,fname); -+ -+ /* FIXME: now follows symlinks... */ -+ return do_open_regular(fnamebuf); -+} -diff -urN rsync-2.5.4/generator.c rsync-2.5.4-fuzzy/generator.c ---- rsync-2.5.4/generator.c Fri Feb 8 03:36:12 2002 -+++ rsync-2.5.4-fuzzy/generator.c Wed Apr 3 17:00:06 2002 -@@ -42,11 +42,12 @@ - extern int always_checksum; - extern int modify_window; - extern char *compare_dest; -+extern int fuzzy; - - /* choose whether to skip a particular file */ - static int skip_file(char *fname, -- struct file_struct *file, STRUCT_STAT *st) -+ struct file_struct *file, const STRUCT_STAT *st) - { - if (st->st_size != file->length) { - return 0; -@@ -185,7 +186,61 @@ - return s; - } + /* + * Acts on file number @p i from @p flist, whose name is @p fname. +@@ -496,6 +574,15 @@ static void recv_generator(char *fname, + } else + partialptr = NULL; -+/* Returns -1 for can't open (null file), -2 for skip */ -+static int open_base_file(struct file_struct *file, -+ char *fname, -+ int statret, -+ STRUCT_STAT *st) -+{ -+ int fd = -1; -+ -+ if (statret == 0) { -+ if (S_ISREG(st->st_mode)) { -+ if (update_only -+ && cmp_modtime(st->st_mtime, file->modtime) > 0) { -+ if (verbose > 1) -+ rprintf(FINFO,"%s is newer\n",fname); -+ return -2; -+ } -+ if (skip_file(fname, file, st)) { -+ set_perms(fname, file, st, 1); -+ return -2; -+ } -+ fd = do_open(fname, O_RDONLY, 0); -+ if (fd == -1) { -+ rprintf(FERROR,"failed to open %s, continuing : %s\n",fname,strerror(errno)); -+ return -1; -+ } else -+ return fd; -+ } else { -+ /* Try to use symlink contents */ -+ if (S_ISLNK(st->st_mode)) { -+ fd = do_open_regular(fname); -+ /* Don't delete yet; receiver will need it */ -+ } else { -+ if (delete_file(fname) != 0) { -+ if (fd != -1) -+ close(fd); -+ return -2; -+ } -+ } ++ if (statret == -1 && fuzzy_basis) { ++ if (find_fuzzy(fname, fnamecmpbuf, &st) == 0 ++ && S_ISREG(st.st_mode)) { ++ statret = 0; ++ fnamecmp = fnamecmpbuf; ++ fnamecmp_type = FNAMECMP_FUZZY; + } + } + -+ if (fd == -1 && compare_dest != NULL) -+ fd = open_alternate_base_comparedir(fname); + if (statret == -1) { + if (preserve_hard_links && hard_link_check(file, HL_SKIP)) + return; +@@ -524,6 +611,8 @@ static void recv_generator(char *fname, -+ if (fd == -1 && fuzzy) -+ fd = open_alternate_base_fuzzy(fname); -+ -+ /* Update stat to understand size */ -+ if (fd != -1) { -+ if (do_fstat(fd, st) != 0) -+ rprintf(FERROR,"fstat %s : %s\n",fname,strerror(errno)); + if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) + ; ++ else if (fnamecmp_type == FNAMECMP_FUZZY) ++ ; + else if (unchanged_file(fnamecmp, file, &st)) { + if (fnamecmp_type == FNAMECMP_FNAME) + set_perms(fname, file, &st, PERMS_REPORT); +@@ -598,8 +687,24 @@ notify_others: + write_int(f_out, i); + if (protocol_version >= 29 && inplace && !read_batch) + write_byte(f_out, fnamecmp_type); +- if (f_out_name >= 0) ++ if (f_out_name >= 0) { + write_byte(f_out_name, fnamecmp_type); ++ if (fnamecmp_type == FNAMECMP_FUZZY) { ++ uchar lenbuf[3], *lb = lenbuf; ++ int len = strlen(fnamecmpbuf); ++ if (len > 0x7F) { ++#if MAXPATHLEN > 0x7FFF ++ *lb++ = len / 0x10000 + 0x80; ++ *lb++ = len / 0x100; ++#else ++ *lb++ = len / 0x100 + 0x80; ++#endif ++ } ++ *lb = len; ++ write_buf(f_out_name, lenbuf, lb - lenbuf + 1); ++ write_buf(f_out_name, fnamecmpbuf, len); ++ } + } -+ -+ return fd; -+} - /* - * Acts on file number I from FLIST, whose name is fname. -@@ -203,9 +258,6 @@ - struct sum_struct *s; - int statret; - struct file_struct *file = flist->files[i]; -- char *fnamecmp; -- char fnamecmpbuf[MAXPATHLEN]; -- extern char *compare_dest; - extern int list_only; - extern int preserve_perms; - extern int only_existing; -@@ -341,82 +393,29 @@ + if (dry_run || read_batch) return; - } - -- fnamecmp = fname; -- -- if ((statret == -1) && (compare_dest != NULL)) { -- /* try the file at compare_dest instead */ -- int saveerrno = errno; -- snprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",compare_dest,fname); -- statret = link_stat(fnamecmpbuf,&st); -- if (!S_ISREG(st.st_mode)) -- statret = -1; -- if (statret == -1) -- errno = saveerrno; -- else -- fnamecmp = fnamecmpbuf; -- } -- -- if (statret == -1) { -- if (errno == ENOENT) { -- write_int(f_out,i); -- if (!dry_run) send_sums(NULL,f_out); -- } else { -- if (verbose > 1) -- rprintf(FERROR, RSYNC_NAME -- ": recv_generator failed to open \"%s\": %s\n", -- fname, strerror(errno)); -- } -- return; -- } -- -- if (!S_ISREG(st.st_mode)) { -- if (delete_file(fname) != 0) { -- return; -- } -- -- /* now pretend the file didn't exist */ -- write_int(f_out,i); -- if (!dry_run) send_sums(NULL,f_out); -- return; -- } -- -- if (opt_ignore_existing && fnamecmp == fname) { -- if (verbose > 1) -- rprintf(FINFO,"%s exists\n",fname); -- return; -- } -- -- if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) { -+ /* Failed to stat for some other reason. */ -+ if (statret == -1 && errno != ENOENT) { - if (verbose > 1) -- rprintf(FINFO,"%s is newer\n",fname); -+ rprintf(FERROR, RSYNC_NAME -+ ": recv_generator failed to open \"%s\": %s\n", -+ fname, strerror(errno)); - return; - } - -- if (skip_file(fname, file, &st)) { -- if (fnamecmp == fname) -- set_perms(fname,file,&st,1); -- return; -- } -- -- if (dry_run) { -- write_int(f_out,i); -+ fd = open_base_file(file, fname, statret, &st); -+ if (fd == -2) - return; -- } -- -- if (whole_file) { -- write_int(f_out,i); -- send_sums(NULL,f_out); -- return; -- } -- -- /* open the file */ -- fd = do_open(fnamecmp, O_RDONLY, 0); - -- if (fd == -1) { -- rprintf(FERROR,RSYNC_NAME": failed to open \"%s\", continuing : %s\n",fnamecmp,strerror(errno)); -- /* pretend the file didn't exist */ -+ if ((whole_file || dry_run) && fd != -1) { -+ close(fd); -+ fd = -1; -+ } -+ -+ if (fd == -1) { -+ /* the file didn't exist, or we can pretend it doesn't */ - write_int(f_out,i); -- send_sums(NULL,f_out); -+ if (!dry_run) -+ send_sums(NULL,f_out); - return; - } +--- orig/main.c 2005-01-17 23:11:45 ++++ 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; + extern int recurse; ++extern int fuzzy_basis; + extern int relative_paths; + extern int rsync_port; + extern int whole_file; +@@ -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] || partial_dir) && !dry_run; ++ BOOL need_name_pipe = (basis_dir[0] || partial_dir || fuzzy_basis) ++ && !dry_run; -@@ -427,7 +426,7 @@ + /* 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-17 23:11:45 ++++ 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; + int bwlimit = 0; ++int fuzzy_basis = 0; + size_t bwlimit_writemax = 0; + int delete_after = 0; + int only_existing = 0; +@@ -288,6 +289,7 @@ void usage(enum logcode F) + rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); + rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n"); + rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n"); ++ rprintf(F," --fuzzy find similar file for basis when no dest file\n"); + rprintf(F," -P equivalent to --partial --progress\n"); + rprintf(F," -z, --compress compress file data\n"); + rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n"); +@@ -384,6 +386,7 @@ static struct poptOption long_options[] + {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 }, + {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 }, + {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, ++ {"fuzzy", 0, POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 }, + /* 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 }, +@@ -1234,6 +1237,9 @@ void server_options(char **args,int *arg + args[ac++] = "--no-relative"; } - if (verbose > 3) -- rprintf(FINFO,"gen mapped %s of size %.0f\n",fnamecmp,(double)st.st_size); -+ rprintf(FINFO,"gen mapped %s of size %.0f\n",fname,(double)st.st_size); - - s = generate_sums(buf,st.st_size,adapt_block_size(file, block_size)); - -diff -urN rsync-2.5.4/options.c rsync-2.5.4-fuzzy/options.c ---- rsync-2.5.4/options.c Thu Feb 28 09:49:57 2002 -+++ rsync-2.5.4-fuzzy/options.c Wed Apr 3 16:43:54 2002 -@@ -73,6 +73,7 @@ - #else - int modify_window=0; - #endif -+int fuzzy=0; - int blocking_io=-1; - - /** Network address family. **/ -@@ -245,6 +246,7 @@ - rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n"); - rprintf(F," --write-batch=PREFIX write batch fileset starting with PREFIX\n"); - rprintf(F," --read-batch=PREFIX read batch fileset starting with PREFIX\n"); -+ rprintf(F," --fuzzy use similar file as basis if it does't exist\n"); - rprintf(F," -h, --help show this help screen\n"); - #ifdef INET6 - rprintf(F," -4 prefer IPv4\n"); -@@ -340,6 +342,7 @@ - {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links}, - {"read-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_READ_BATCH}, - {"write-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_WRITE_BATCH}, -+ {"fuzzy", 0, POPT_ARG_NONE, &fuzzy}, - #ifdef INET6 - {0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET }, - {0, '6', POPT_ARG_VAL, &default_af_hint, AF_INET6 }, -@@ -757,7 +760,9 @@ - args[ac++] = "--compare-dest"; - args[ac++] = compare_dest; - } -- -+ -+ if (fuzzy && am_sender) ++ if (fuzzy_basis && am_sender) + args[ac++] = "--fuzzy"; - ++ *argc = ac; - } -diff -urN rsync-2.5.4/proto.h rsync-2.5.4-fuzzy/proto.h ---- rsync-2.5.4/proto.h Sat Feb 23 11:05:06 2002 -+++ rsync-2.5.4-fuzzy/proto.h Wed Apr 3 16:35:25 2002 -@@ -256,3 +256,6 @@ - int cmp_modtime(time_t file1, time_t file2); - int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6); - int sys_gettimeofday(struct timeval *tv); -+int do_open_regular(char *fname); -+int open_alternate_base_fuzzy(const char *fname); -+int open_alternate_base_comparedir(const char *fname); -diff -urN rsync-2.5.4/receiver.c rsync-2.5.4-fuzzy/receiver.c ---- rsync-2.5.4/receiver.c Thu Feb 14 05:42:20 2002 -+++ rsync-2.5.4-fuzzy/receiver.c Wed Apr 3 16:46:46 2002 -@@ -36,6 +36,7 @@ - extern char *compare_dest; - extern int make_backups; - extern char *backup_suffix; -+extern int fuzzy; + return; - static struct delete_list { - DEV64_T dev; -@@ -307,8 +308,6 @@ - char *fname; - char template[MAXPATHLEN]; - char fnametmp[MAXPATHLEN]; -- char *fnamecmp; -- char fnamecmpbuf[MAXPATHLEN]; - struct map_struct *buf; - int i; - struct file_struct *file; -@@ -366,28 +365,24 @@ - if (verbose > 2) - rprintf(FINFO,"recv_files(%s)\n",fname); +--- orig/receiver.c 2005-01-17 23:11:45 ++++ receiver.c 2005-01-15 21:21:02 +@@ -324,6 +324,27 @@ static int receive_data(int f_in, char * + } -- fnamecmp = fname; -- - /* open the file */ -- fd1 = do_open(fnamecmp, O_RDONLY, 0); -+ fd1 = do_open(fname, O_RDONLY, 0); -- if ((fd1 == -1) && (compare_dest != NULL)) { -- /* try the file at compare_dest instead */ -- snprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s", -- compare_dest,fname); -- fnamecmp = fnamecmpbuf; -- fd1 = do_open(fnamecmp, O_RDONLY, 0); -- } -+ if (fd1 == -1 && compare_dest != NULL) -+ fd1 = open_alternate_base_comparedir(fname); ++static void read_gen_name(int fd, char *buf) ++{ ++ int len = read_byte(fd); ++ if (len & 0x80) { ++#if MAXPATHLEN > 32767 ++ uchar lenbuf[2]; ++ read_buf(fd, (char *)lenbuf, 2); ++ len = (len & ~0x80) * 0x10000 + lenbuf[0] * 0x100 + lenbuf[1]; ++#else ++ len = (len & ~0x80) * 0x100 + read_byte(fd); ++#endif ++ } ++ if (len >= MAXPATHLEN) { ++ rprintf(FERROR, "bogus data on generator name pipe\n"); ++ exit_cleanup(RERR_PROTOCOL); ++ } ++ ++ read_sbuf(fd, buf, len); ++} ++ + -+ if (fd1 == -1 && fuzzy) -+ fd1 = open_alternate_base_fuzzy(fname); + static void discard_receive_data(int f_in, OFF_T length) + { + receive_data(f_in, NULL, -1, 0, NULL, -1, length); +@@ -454,6 +475,10 @@ int recv_files(int f_in, struct file_lis + case FNAMECMP_BACKUP: + fnamecmp = get_backup_name(fname); + break; ++ case FNAMECMP_FUZZY: ++ read_gen_name(f_in_name, fnamecmpbuf); ++ fnamecmp = fnamecmpbuf; ++ break; + default: + if (j >= basis_dir_cnt) { + rprintf(FERROR, +--- orig/rsync.h 2005-01-17 23:11:45 ++++ rsync.h 2005-01-15 21:24:09 +@@ -128,6 +128,7 @@ + #define FNAMECMP_FNAME 0x80 + #define FNAMECMP_PARTIAL_DIR 0x81 + #define FNAMECMP_BACKUP 0x82 ++#define FNAMECMP_FUZZY 0x83 - if (fd1 != -1 && do_fstat(fd1,&st) != 0) { -- rprintf(FERROR,"fstat %s : %s\n",fnamecmp,strerror(errno)); -+ rprintf(FERROR,"fstat %s : %s\n",fname,strerror(errno)); - receive_data(f_in,NULL,-1,NULL,file->length); - close(fd1); - continue; - } - if (fd1 != -1 && !S_ISREG(st.st_mode)) { -- rprintf(FERROR,"%s : not a regular file (recv_files)\n",fnamecmp); -+ rprintf(FERROR,"%s : not a regular file (recv_files)\n",fname); - receive_data(f_in,NULL,-1,NULL,file->length); - close(fd1); - continue; -@@ -403,7 +398,7 @@ - if (fd1 != -1 && st.st_size > 0) { - buf = map_file(fd1,st.st_size); - if (verbose > 2) -- rprintf(FINFO,"recv mapped %s of size %.0f\n",fnamecmp,(double)st.st_size); -+ rprintf(FINFO,"recv mapped %s of size %.0f\n",fname,(double)st.st_size); - } else { - buf = NULL; - } - + /* Log-message categories. FLOG is only used on the daemon side to +--- orig/rsync.yo 2005-01-17 23:11:46 ++++ rsync.yo 2005-01-15 21:48:52 +@@ -358,6 +358,7 @@ verb( + --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 ++ --fuzzy find similar file for basis when no dest + -P equivalent to --partial --progress + -z, --compress compress file data + -C, --cvs-exclude auto ignore files in the same way CVS does +@@ -878,6 +879,11 @@ Note that rsync versions prior to 2.6.1 + (or implied by -a). You can work-around this bug by avoiding the -o option + when sending to an old rsync. + ++dit(bf(--fuzzy)) This option tells rsync that it should look around for a ++basis file for any destination file that is missing. The current algorithm ++looks for a similarly-named file in the same directory as the destination ++file, and, if found, uses that to try to speed up the transfer. ++ + dit(bf(-z, --compress)) With this option, rsync compresses any data from + the files that it sends to the destination machine. This + option is useful on slow connections. The compression method used is the