Be sure to run "make proto" before "make".
---- orig/generator.c 2005-01-01 21:11:00
-+++ generator.c 2004-11-27 18:12:57
+--- 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 always_checksum;
extern char *partial_dir;
extern char *basis_dir[];
-@@ -239,6 +240,92 @@ static void generate_and_send_sums(int f
+@@ -242,6 +243,83 @@ static void generate_and_send_sums(int f
}
-+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 = ".";
-+ }
-+}
-+
-+
+static unsigned int measure_name(const char *name, const char *basename,
+ const char *ext)
+{
+{
+ 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;
+
-+ strlcpy(mangled_name, fname, sizeof mangled_name);
++ 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);
+ 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, '.')))
++ for (ext = basename; *ext == '.'; ext++) {}
++ if (!(ext = strrchr(ext, '.')))
+ ext = basename + strlen(basename); /* ext = "" */
+
+ while ((di = readdir(d)) != NULL) {
+
+ 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);
-+ }
++ strlcpy(basename, MAXPATHLEN - (basename - buf), 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.
-@@ -493,6 +580,15 @@ static void recv_generator(char *fname,
+@@ -496,6 +574,15 @@ static void recv_generator(char *fname,
} else
partialptr = NULL;
if (statret == -1) {
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
-@@ -521,6 +617,8 @@ static void recv_generator(char *fname,
+@@ -524,6 +611,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);
-@@ -592,8 +690,24 @@ prepare_to_open:
-
- notify_others:
+@@ -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 (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-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 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 2005-01-01 21:11:00
-+++ options.c 2004-11-29 01:36:48
+--- 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;
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");
/* 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 },
-@@ -958,10 +961,10 @@ int parse_arguments(int *argc, const cha
- am_server ? "server" : "client");
- return 0;
- #endif
-- if (compare_dest || copy_dest || link_dest) {
-+ 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
+@@ -1234,6 +1237,9 @@ void server_options(char **args,int *arg
args[ac++] = "--no-relative";
}
*argc = ac;
return;
---- orig/receiver.c 2005-01-01 21:11:00
-+++ receiver.c 2004-11-27 18:15:01
-@@ -323,6 +323,27 @@ static int receive_data(int f_in, char *
+--- 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 *
}
static void discard_receive_data(int f_in, OFF_T length)
{
receive_data(f_in, NULL, -1, 0, NULL, -1, length);
-@@ -453,6 +474,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 2005-01-01 21:11:01
-+++ rsync.h 2004-11-03 22:53:09
-@@ -125,6 +125,7 @@
+ 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
/* Log-message categories. FLOG is only used on the daemon side to
---- orig/rsync.yo 2005-01-01 21:11:01
-+++ rsync.yo 2004-11-27 18:15:22
+--- 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 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
+@@ -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
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff