-From: Rusty Russell <rusty@rustcorp.com.au>
-Date: Wed, 03 Apr 2002 17:08:57 +1000
+Depends-On-Patch: partial-dir.diff
+Depends-On-Patch: g2r-basis-filename.diff
-Found old patch on google, and updated it for 2.5.4 (I know, but that's what
-apt-get source gave me).
+The changes to generator.c were greatly simplified, making the patch
+easier to maintain and fixing the failing test in the testsuite.
+Very lightly tested.
-Compiles, otherwise untested.
-Rusty.
+Be sure to run "make proto" before "make".
-[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 15 May 2004 00:48:11 -0000 1.101
-+++ Makefile.in 21 May 2004 09:51:19 -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 18 May 2004 08:50:17 -0000 1.85
-+++ generator.c 21 May 2004 09:51:19 -0000
-@@ -51,6 +51,7 @@ extern int list_only;
- extern int only_existing;
- extern int orig_umask;
- extern int safe_symlinks;
+--- orig/generator.c 2004-07-28 10:14:15
++++ generator.c 2004-07-28 10:23:12
+@@ -41,6 +41,7 @@ extern int ignore_times;
+ extern int size_only;
+ extern int io_timeout;
+ extern int protocol_version;
+extern int fuzzy;
-
- extern struct exclude_list_struct server_exclude_list;
-
-@@ -258,7 +259,61 @@ static void generate_and_send_sums(struc
- }
+ extern int always_checksum;
+ extern char *partial_dir;
+ extern char *compare_dest;
+@@ -249,6 +250,94 @@ 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)
+
++static void split_names(char *fname, char **dirname, char **basename)
+{
-+ int fd = -1;
++ char *slash = strrchr(fname, '/');
++ if (slash) {
++ *dirname = fname;
++ *slash = '\0';
++ *basename = slash+1;
++ } else {
++ *basename = fname;
++ *dirname = ".";
++ }
++}
+
-+ 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) {
-+ rsyserr(FERROR, errno, "failed to open %s, continuing",
-+ full_fname(fname));
-+ 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 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;
++}
++
++
++static int find_fuzzy(char **fname_ptr, 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_ptr, sizeof mangled_name);
++
++ split_names(mangled_name, &dirname, &basename);
++ if (!(d = opendir(dirname))) {
++ rsyserr(FERROR, errno, "recv_generator opendir(%s)", dirname);
++ return -1;
+ }
+
-+ if (fd == -1 && compare_dest != NULL)
-+ fd = open_alternate_base_comparedir(fname);
++ /* Get final extension, eg. .gz; never full basename though. */
++ ext = strrchr(basename + 1, '.');
++ if (!ext)
++ ext = basename + strlen(basename); /* ext = "" */
++
++ while ((di = readdir(d)) != NULL) {
++ const char *dname = d_name(di);
++ unsigned int score;
+
-+ if (fd == -1 && fuzzy)
-+ fd = open_alternate_base_fuzzy(fname);
++ if (dname[0] == '.' && (dname[1] == '\0'
++ || (dname[1] == '.' && dname[2] == '\0')))
++ continue;
+
-+ /* Update stat to understand size */
-+ if (fd != -1) {
-+ if (do_fstat(fd, st) != 0) {
-+ rsyserr(FERROR, errno, "fstat %s", full_fname(fname));
++ score = measure_name(dname, basename, ext);
++ if (verbose > 4) {
++ rprintf(FINFO, "[%s] fuzzy score for %s = %u\n",
++ who_am_i(), dname, score);
++ }
++ if (score > bestscore) {
++ strlcpy(bestname, dname, sizeof bestname);
++ bestscore = score;
+ }
+ }
-
-+ return fd;
++ closedir(d);
++
++ /* Found a candidate. */
++ if (bestscore != 0) {
++ pathjoin(buf, MAXPATHLEN, dirname, bestname);
++ if (verbose > 2) {
++ rprintf(FINFO, "[%s] fuzzy match %s->%s\n",
++ who_am_i(), *fname_ptr, buf);
++ }
++ *fname_ptr = buf;
++ return link_stat(buf, st_ptr, 0);
++ }
++ return -1;
+}
++
- /**
+ /*
* Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -274,8 +329,6 @@ void recv_generator(char *fname, struct
+@@ -263,7 +352,7 @@ static void recv_generator(char *fname,
+ {
+ int fd = -1;
STRUCT_STAT st;
- struct map_struct *mapbuf;
- int statret;
-- char *fnamecmp;
-- char fnamecmpbuf[MAXPATHLEN];
-
- if (list_only)
- return;
-@@ -413,107 +466,39 @@ 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) {
-- rsyserr(FINFO, errno, "link %s => %s",
-- fnamecmpbuf, fname);
-- }
-- }
-- 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) {
- rsyserr(FERROR, errno,
-- "recv_generator: failed to open %s",
-+ "recv_generator failed to stat %s",
- full_fname(fname));
- }
+- int statret, stat_errno;
++ int statret, stat_errno, fuzzy_file = 0;
+ char *fnamecmp;
+ char fnamecmpbuf[MAXPATHLEN];
+
+@@ -448,6 +537,14 @@ static void recv_generator(char *fname,
+ } else
+ *fnamecmpbuf = '\0';
+
++ if (statret == -1 && fuzzy) {
++ statret = find_fuzzy(&fnamecmp, fnamecmpbuf, &st);
++ if (!S_ISREG(st.st_mode))
++ statret = -1;
++ else
++ fuzzy_file = 1;
++ }
++
+ if (statret == 0 && !S_ISREG(st.st_mode)) {
+ if (delete_file(fname) != 0)
+ return;
+@@ -481,7 +578,7 @@ static void recv_generator(char *fname,
return;
}
-- 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);
-- 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 (skip_file(fname, file, &st)) {
-- if (fnamecmp == fname)
-- set_perms(fname, file, &st, PERMS_REPORT);
-- return;
-- }
--
-- if (dry_run) {
-- write_int(f_out,i);
-+ if ((fd = open_base_file(file, fname, statret, &st)) == -2)
++ if (!fuzzy_file && skip_file(fname, file, &st)) {
+ if (!*fnamecmpbuf)
+ set_perms(fname, file, &st, PERMS_REPORT);
return;
-- }
-
-- if (disable_deltas_p()) {
-- write_int(f_out,i);
-- write_sum_head(f_out, NULL);
-- return;
-+ if ((disable_deltas_p() || dry_run) && fd != -1) {
-+ close(fd);
-+ fd = -1;
- }
-
-- /* open the file */
-- fd = do_open(fnamecmp, O_RDONLY, 0);
--
- if (fd == -1) {
-- rsyserr(FERROR, errno, "failed to open %s, continuing",
-- full_fname(fnamecmp));
-- /* pretend the file didn't exist */
-+ /* the file didn't exist, or we can pretend it doesn't */
- 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;
- }
-
-@@ -523,7 +508,7 @@ void recv_generator(char *fname, struct
- mapbuf = NULL;
-
- 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 21 May 2004 09:44:32 -0000 1.150
-+++ options.c 21 May 2004 09:51:20 -0000
-@@ -91,6 +91,7 @@ int ignore_errors = 0;
- int modify_window = 0;
- int blocking_io = -1;
- int checksum_seed = 0;
+--- orig/main.c 2004-07-22 00:10:43
++++ main.c 2004-07-22 00:32:31
+@@ -47,6 +47,7 @@ extern int keep_dirlinks;
+ extern int preserve_hard_links;
+ extern int protocol_version;
+ extern int recurse;
++extern int fuzzy;
+ extern int relative_paths;
+ extern int rsync_port;
+ extern int whole_file;
+@@ -458,7 +459,7 @@ 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 = compare_dest && !dry_run;
++ BOOL need_name_pipe = (compare_dest || fuzzy) && !dry_run;
+
+ if (preserve_hard_links)
+ init_hard_links(flist);
+--- orig/options.c 2004-07-26 16:43:48
++++ options.c 2004-07-16 20:14:12
+@@ -85,6 +85,7 @@ int safe_symlinks = 0;
+ int copy_unsafe_links = 0;
+ int size_only = 0;
+ int bwlimit = 0;
+int fuzzy = 0;
- unsigned int block_size = 0;
-
-
-@@ -266,6 +267,7 @@ void usage(enum logcode F)
- rprintf(F," -T --temp-dir=DIR create temporary files in directory DIR\n");
+ size_t bwlimit_writemax = 0;
+ int delete_after = 0;
+ int only_existing = 0;
+@@ -279,6 +280,7 @@ void usage(enum logcode F)
+ rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n");
rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
rprintf(F," --link-dest=DIR create hardlinks to DIR for unchanged files\n");
+ rprintf(F," --fuzzy use similar file as basis if basis doesn't exist\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");
-@@ -363,6 +365,7 @@ static struct poptOption long_options[]
+@@ -378,6 +380,7 @@ static struct poptOption long_options[]
{"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, &compare_dest, OPT_LINK_DEST, 0, 0 },
/* TODO: Should this take an optional int giving the compression level? */
{"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 },
{"daemon", 0, POPT_ARG_NONE, &daemon_opt, 0, 0, 0 },
-@@ -972,6 +975,9 @@ void server_options(char **args,int *arg
+@@ -1039,6 +1042,9 @@ void server_options(char **args,int *arg
}
}
*argc = ac;
return;
---- receiver.c 21 May 2004 08:27:04 -0000 1.79
-+++ receiver.c 21 May 2004 09:51:20 -0000
-@@ -47,6 +47,7 @@ extern int ignore_errors;
- extern int orig_umask;
- extern int keep_partial;
- extern int checksum_seed;
-+extern int fuzzy;
-
- static void delete_one(char *fn, int is_dir)
- {
-@@ -295,8 +296,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;
-@@ -359,35 +358,31 @@ int recv_files(int f_in,struct file_list
- if (verbose > 2)
- rprintf(FINFO,"recv_files(%s)\n",fname);
-
-- 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);
-+
-+ if (fd1 == -1 && fuzzy)
-+ fd1 = open_alternate_base_fuzzy(fname);
-
- if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
- rsyserr(FERROR, errno, "fstat %s failed",
-- full_fname(fnamecmp));
-+ full_fname(fname));
- 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;
-@@ -408,8 +403,10 @@ int recv_files(int f_in,struct file_list
-
- 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;
-
---- rsync.yo 21 May 2004 09:44:32 -0000 1.170
-+++ rsync.yo 21 May 2004 09:51:21 -0000
-@@ -324,6 +324,7 @@ verb(
+--- orig/receiver.c 2004-07-23 21:59:07
++++ receiver.c 2004-07-23 22:08:03
+@@ -39,7 +39,6 @@ extern int cvs_exclude;
+ extern int io_error;
+ extern char *tmpdir;
+ extern char *partial_dir;
+-extern char *compare_dest;
+ extern int make_backups;
+ extern int do_progress;
+ extern char *backup_dir;
+--- orig/rsync.yo 2004-07-28 02:26:19
++++ rsync.yo 2004-07-03 19:27:25
+@@ -327,6 +327,7 @@ verb(
-T --temp-dir=DIR create temporary files in directory DIR
--compare-dest=DIR also compare received files relative to DIR
--link-dest=DIR create hardlinks to DIR for unchanged files
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff