Be sure to run "make proto" before "make".
---- orig/generator.c 2004-11-27 17:53:24
-+++ 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;
extern int always_checksum;
extern char *partial_dir;
extern char *basis_dir[];
-@@ -247,6 +248,92 @@ static void generate_and_send_sums(int f
+@@ -239,6 +240,90 @@ static void generate_and_send_sums(int f
}
+
+ score = measure_name(dname, basename, ext);
+ if (verbose > 4) {
-+ rprintf(FINFO, "[%s] fuzzy score for %s = %u\n",
-+ who_am_i(), dname, score);
++ rprintf(FINFO, "fuzzy score for %s = %u\n",
++ dname, score);
+ }
+ if (score > bestscore) {
+ strlcpy(bestname, dname, sizeof bestname);
+ /* 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, buf);
-+ }
++ 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.
-@@ -501,6 +588,15 @@ static void recv_generator(char *fname,
+@@ -493,6 +578,15 @@ static void recv_generator(char *fname,
} else
partialptr = NULL;
if (statret == -1) {
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
-@@ -529,6 +625,8 @@ static void recv_generator(char *fname,
+@@ -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)
+ ;
else if (unchanged_file(fnamecmp, file, &st)) {
if (fnamecmp_type == FNAMECMP_FNAME)
set_perms(fname, file, &st, PERMS_REPORT);
-@@ -600,8 +698,24 @@ prepare_to_open:
+@@ -593,8 +689,24 @@ prepare_to_open:
notify_others:
write_int(f_out, i);
if (dry_run || read_batch)
return;
---- orig/main.c 2004-11-27 17:53:24
-+++ 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;
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. */
---- orig/options.c 2004-11-27 18:27:35
-+++ 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;
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 use similar file as basis if basis doesn't exist\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");
-@@ -383,6 +385,7 @@ static struct poptOption long_options[]
+@@ -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 },
/* 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 },
-@@ -957,10 +960,10 @@ int parse_arguments(int *argc, const cha
- am_server ? "server" : "client");
- return 0;
- #endif
-- if (compare_dest || copy_dest || link_dest) {
+@@ -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 : "--fuzzy");
return 0;
}
- } else {
-@@ -1237,6 +1240,9 @@ void server_options(char **args,int *arg
- }
+ #else
+@@ -1240,6 +1243,9 @@ void server_options(char **args,int *arg
+ args[ac++] = "--no-relative";
}
+ if (fuzzy_basis && am_sender)
*argc = ac;
return;
---- orig/receiver.c 2004-11-27 17:57:31
-+++ receiver.c 2004-11-27 18:15:01
-@@ -320,6 +320,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 *
}
static void discard_receive_data(int f_in, OFF_T length)
{
receive_data(f_in, NULL, -1, 0, NULL, -1, length);
-@@ -450,6 +471,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;
+ read_gen_name(f_in_name, fnamecmpbuf);
+ fnamecmp = fnamecmpbuf;
+ break;
- case FNAMECMP_BASIS_DIR:
default:
- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
---- orig/rsync.h 2004-11-27 17:53:24
-+++ 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
/* Log-message categories. FLOG is only used on the daemon side to
---- orig/rsync.yo 2004-11-29 01:31:40
+--- 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 use similar file as basis if basis is gone
++ --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