-From: Rusty Russell <rusty@rustcorp.com.au>
-Date: Wed, 03 Apr 2002 17:08:57 +1000
+The changes to generator.c were greatly simplified, making the patch
+easier to maintain and fixing the failing test in the testsuite.
+Lightly tested.
-Found old patch on google, and updated it for 2.5.4 (I know, but that's what
-apt-get source gave me).
+Be sure to run "make proto" before "make".
-Compiles, otherwise untested.
-Rusty.
-
-[Updated for current CVS version by Wayne Davison. Passes *MOST* of the
-test suite, but otherwise UNTESTED.]
---
- Anyone who quotes me in their sig is an idiot. -- Rusty Russell.
-
---- Makefile.in 2 May 2004 17:04:14 -0000 1.100
-+++ Makefile.in 13 May 2004 19:15:31 -0000
-@@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
- 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
-+ 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
- OBJS3=progress.o pipe.o
---- generator.c 13 May 2004 06:55:01 -0000 1.82
-+++ generator.c 13 May 2004 19:15:31 -0000
-@@ -51,6 +51,7 @@ extern int list_only;
- extern int only_existing;
- extern int orig_umask;
- extern int safe_symlinks;
-+extern int fuzzy;
-
-
- /* choose whether to skip a particular file */
-@@ -256,7 +257,62 @@ static void generate_and_send_sums(struc
- }
+--- 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;
+ extern int protocol_version;
++extern int fuzzy_basis;
+ extern int always_checksum;
+ extern char *partial_dir;
+ extern char *basis_dir[];
+@@ -239,6 +240,90 @@ static void generate_and_send_sums(int f
}
-+/* 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, PERMS_REPORT);
-+ return -2;
-+ }
-+ fd = do_open(fname, O_RDONLY, 0);
-+ if (fd == -1) {
-+ rprintf(FERROR, "failed to open %s, continuing : %s\n",
-+ full_fname(fname), strerror(errno));
-+ return -1;
-+ }
-+ 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;
-+ }
-+ }
-+ }
++static void split_names(char *fname, char **dirname, char **basename)
++{
++ char *slash = strrchr(fname, '/');
++ if (slash) {
++ *dirname = fname;
++ *slash = '\0';
++ *basename = slash+1;
++ } else {
++ *basename = fname;
++ *dirname = ".";
+ }
++}
++
+
-+ if (fd == -1 && compare_dest != NULL)
-+ fd = open_alternate_base_comparedir(fname);
++static unsigned int measure_name(const char *name, const char *basename,
++ const char *ext)
++{
++ int namelen = strlen(name);
++ int extlen = strlen(ext);
++ unsigned int score = 0;
++
++ /* Extensions must match */
++ if (namelen <= extlen || strcmp(name + namelen - extlen, ext) != 0)
++ return 0;
++
++ /* Now score depends on similarity of prefix */
++ for (; *name == *basename && *name; name++, basename++)
++ score++;
++ return score;
++}
+
-+ 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",
-+ full_fname(fname), strerror(errno));
++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 bestname[MAXPATHLEN];
++ unsigned int bestscore = 0;
++ const char *ext;
++
++ strlcpy(mangled_name, fname, sizeof mangled_name);
++
++ split_names(mangled_name, &dirname, &basename);
++ if (!(d = opendir(dirname))) {
++ rsyserr(FERROR, errno, "recv_generator opendir(%s)", dirname);
++ return -1;
++ }
++
++ /* Get final extension, eg. .gz; never full basename though. */
++ if (!(ext = strrchr(basename + 1, '.')))
++ ext = basename + strlen(basename); /* ext = "" */
++
++ while ((di = readdir(d)) != NULL) {
++ const char *dname = d_name(di);
++ unsigned int score;
++
++ 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",
++ dname, score);
++ }
++ if (score > bestscore) {
++ strlcpy(bestname, dname, sizeof bestname);
++ bestscore = score;
+ }
+ }
++ closedir(d);
+
-+ return fd;
++ /* Found a candidate. */
++ if (bestscore != 0) {
++ pathjoin(buf, MAXPATHLEN, dirname, bestname);
++ if (verbose > 2)
++ rprintf(FINFO, "fuzzy match %s->%s\n", fname, buf);
++ return link_stat(buf, st_ptr, 0);
++ }
++ return -1;
+}
++
- /**
+ /*
* Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -272,8 +328,6 @@ void recv_generator(char *fname, struct
- STRUCT_STAT st;
- struct map_struct *mapbuf;
- int statret;
-- char *fnamecmp;
-- char fnamecmpbuf[MAXPATHLEN];
-
- if (list_only)
- return;
-@@ -398,108 +452,38 @@ void recv_generator(char *fname, struct
- }
- #endif
-
-- if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER))
-- return;
--
-- if (!S_ISREG(file->mode)) {
-- rprintf(FINFO, "skipping non-regular file \"%s\"\n",fname);
-- return;
-- }
--
-- fnamecmp = fname;
--
-- if (statret == -1 && compare_dest != NULL) {
-- /* try the file at compare_dest instead */
-- int saveerrno = errno;
-- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, compare_dest, fname);
-- statret = link_stat(fnamecmpbuf,&st);
-- if (!S_ISREG(st.st_mode))
-- statret = -1;
-- if (statret == -1)
-- errno = saveerrno;
--#if HAVE_LINK
-- else if (link_dest && !dry_run) {
-- if (do_link(fnamecmpbuf, fname) != 0) {
-- if (verbose > 0) {
-- rprintf(FINFO,"link %s => %s : %s\n",
-- fnamecmpbuf, fname,
-- strerror(errno));
-- }
-- }
-- fnamecmp = fnamecmpbuf;
-- }
--#endif
-- else
-- fnamecmp = fnamecmpbuf;
-- }
--
-- if (statret == -1) {
-- if (preserve_hard_links && hard_link_check(file, HL_SKIP))
-- return;
-- if (errno == ENOENT) {
-- write_int(f_out,i);
-- if (!dry_run) write_sum_head(f_out, NULL);
-- } else if (verbose > 1) {
-+ /* Failed to stat for some reason besides "not found". */
-+ if (statret == -1 && errno != ENOENT) {
-+ if (verbose > 1)
- rprintf(FERROR,
-- "recv_generator: failed to open %s: %s\n",
-+ "recv_generator failed to stat %s: %s\n",
- full_fname(fname), strerror(errno));
-- }
- return;
- }
+@@ -493,6 +578,15 @@ static void recv_generator(char *fname,
+ } else
+ partialptr = NULL;
-- if (!S_ISREG(st.st_mode)) {
-- if (delete_file(fname) != 0) {
-- return;
-- }
--
-- /* now pretend the file didn't exist */
-- if (preserve_hard_links && hard_link_check(file, HL_SKIP))
-- return;
-- write_int(f_out,i);
-- if (!dry_run) write_sum_head(f_out, NULL);
-+ if ((fd = open_base_file(file, fname, statret, &st)) == -2)
- 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) {
-- if (verbose > 1)
-- rprintf(FINFO,"%s is newer\n",fname);
-- return;
-+ if ((disable_deltas_p() || dry_run) && fd != -1) {
-+ close(fd);
-+ fd = -1;
- }
-
-- if (skip_file(fname, file, &st)) {
-- if (fnamecmp == fname)
-- set_perms(fname, file, &st, PERMS_REPORT);
-- return;
-- }
--
-- if (dry_run) {
-- write_int(f_out,i);
-- return;
-- }
--
-- if (disable_deltas_p()) {
-- write_int(f_out,i);
-- write_sum_head(f_out, NULL);
-- return;
-- }
--
-- /* open the file */
-- fd = do_open(fnamecmp, O_RDONLY, 0);
--
- if (fd == -1) {
-- rprintf(FERROR, "failed to open %s, continuing: %s\n",
-- full_fname(fnamecmp), strerror(errno));
-- /* pretend the file didn't exist */
-+ /* the file didn't exist, or we can pretend it doesn't */
++ 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 (statret == -1) {
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
-- write_int(f_out,i);
-- write_sum_head(f_out, NULL);
-+ write_int(f_out, i);
-+ if (!dry_run)
-+ write_sum_head(f_out, NULL);
-+ return;
-+ }
-+
-+ if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER))
-+ return;
-+
-+ if (!S_ISREG(file->mode)) {
-+ rprintf(FINFO, "skipping non-regular file \"%s\"\n",fname);
- return;
- }
+@@ -521,6 +615,8 @@ static void recv_generator(char *fname,
-@@ -509,7 +493,7 @@ void recv_generator(char *fname, struct
- mapbuf = NULL;
+ 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);
+@@ -593,8 +689,24 @@ prepare_to_open:
- if (verbose > 3) {
-- rprintf(FINFO,"gen mapped %s of size %.0f\n", fnamecmp,
-+ rprintf(FINFO, "gen mapped %s of size %.0f\n", fname,
- (double)st.st_size);
- }
-
---- options.c 6 May 2004 21:08:01 -0000 1.148
-+++ options.c 13 May 2004 19:15:32 -0000
-@@ -91,6 +91,7 @@ int ignore_errors = 0;
- int modify_window = 0;
- int blocking_io = -1;
- int checksum_seed = 0;
-+int fuzzy = 0;
- unsigned int block_size = 0;
+ notify_others:
+ write_int(f_out, i);
+- 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);
++ }
++ }
+ if (dry_run || read_batch)
+ return;
+--- 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;
+ 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;
-@@ -290,6 +291,7 @@ void usage(enum logcode F)
- 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");
- #ifdef INET6
- rprintf(F," -4 --ipv4 prefer IPv4\n");
- rprintf(F," -6 --ipv6 prefer IPv6\n");
-@@ -385,6 +387,7 @@ static struct poptOption long_options[]
- {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
- {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
- {"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 },
-+ {"fuzzy", 0, POPT_ARG_NONE, &fuzzy, 0, 0, 0 },
- {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 },
- #ifdef INET6
- {"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 },
-@@ -964,6 +967,9 @@ void server_options(char **args,int *arg
- args[ac++] = "--from0";
+ /* 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 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;
+ 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 },
+@@ -952,10 +955,10 @@ int parse_arguments(int *argc, const cha
+ return 0;
+ }
+ keep_partial = 0;
+- if (dest_option) {
++ if (dest_option || fuzzy_basis) {
+ snprintf(err_buf, sizeof err_buf,
+ "--inplace does not yet work with %s\n",
+- dest_option);
++ dest_option ? dest_option : "--fuzzy");
+ return 0;
}
+ #else
+@@ -1240,6 +1243,9 @@ void server_options(char **args,int *arg
+ args[ac++] = "--no-relative";
}
-+
-+ if (fuzzy && am_sender)
-+ args[ac++] = "--fuzzy";
++ if (fuzzy_basis && am_sender)
++ args[ac++] = "--fuzzy";
++
*argc = ac;
return;
---- receiver.c 13 May 2004 07:08:22 -0000 1.77
-+++ receiver.c 13 May 2004 19:15:32 -0000
-@@ -46,6 +46,7 @@ extern int module_id;
- extern int ignore_errors;
- extern int orig_umask;
- extern int keep_partial;
-+extern int fuzzy;
- static void delete_one(char *fn, int is_dir)
- {
-@@ -293,8 +294,6 @@ int recv_files(int f_in,struct file_list
- char *fname, fbuf[MAXPATHLEN];
- char template[MAXPATHLEN];
- char fnametmp[MAXPATHLEN];
-- char *fnamecmp;
-- char fnamecmpbuf[MAXPATHLEN];
- struct map_struct *mapbuf;
- int i;
- struct file_struct *file;
-@@ -357,35 +356,31 @@ int recv_files(int f_in,struct file_list
- if (verbose > 2)
- rprintf(FINFO,"recv_files(%s)\n",fname);
+--- 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 *
+ }
-- 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 */
-- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-- 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);
++ }
+
-+ if (fd1 == -1 && fuzzy)
-+ fd1 = open_alternate_base_fuzzy(fname);
-
- if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
- rprintf(FERROR, "fstat %s failed: %s\n",
-- full_fname(fnamecmp), strerror(errno));
-+ full_fname(fname), strerror(errno));
- receive_data(f_in,NULL,-1,NULL,file->length);
- close(fd1);
- continue;
- }
-
-- if (fd1 != -1 && S_ISDIR(st.st_mode) && fnamecmp == fname) {
-+ if (fd1 != -1 && S_ISDIR(st.st_mode)) {
- /* this special handling for directories
- * wouldn't be necessary if robust_rename()
- * and the underlying robust_unlink could cope
- * with directories
- */
- rprintf(FERROR,"recv_files: %s is a directory\n",
-- full_fname(fnamecmp));
-+ full_fname(fname));
- receive_data(f_in, NULL, -1, NULL, file->length);
- close(fd1);
- continue;
-@@ -406,8 +401,10 @@ int recv_files(int f_in,struct file_list
++ read_sbuf(fd, buf, len);
++}
++
++
+ 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-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
++#define FNAMECMP_FUZZY 0x83
- if (fd1 != -1 && st.st_size > 0) {
- mapbuf = map_file(fd1,st.st_size);
-- if (verbose > 2)
-- rprintf(FINFO,"recv mapped %s of size %.0f\n",fnamecmp,(double)st.st_size);
-+ if (verbose > 2) {
-+ rprintf(FINFO, "recv mapped %s of size %.0f\n",
-+ fname, (double)st.st_size);
-+ }
- } else
- mapbuf = NULL;
+ /* Log-message categories. FLOG is only used on the daemon side to
+--- orig/rsync.yo 2005-01-15 04:36:32
++++ rsync.yo 2004-11-27 18:15:22
+@@ -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
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff