1 The changes to generator.c were greatly simplified, making the patch
2 easier to maintain and fixing the failing test in the testsuite.
5 Be sure to run "make proto" before "make".
7 --- orig/generator.c 2005-01-15 21:18:09
8 +++ generator.c 2005-01-15 21:20:10
9 @@ -44,6 +44,7 @@ extern int size_only;
10 extern OFF_T max_size;
11 extern int io_timeout;
12 extern int protocol_version;
13 +extern int fuzzy_basis;
14 extern int always_checksum;
15 extern char *partial_dir;
16 extern char *basis_dir[];
17 @@ -239,6 +240,90 @@ static void generate_and_send_sums(int f
21 +static void split_names(char *fname, char **dirname, char **basename)
23 + char *slash = strrchr(fname, '/');
27 + *basename = slash+1;
35 +static unsigned int measure_name(const char *name, const char *basename,
38 + int namelen = strlen(name);
39 + int extlen = strlen(ext);
40 + unsigned int score = 0;
42 + /* Extensions must match */
43 + if (namelen <= extlen || strcmp(name + namelen - extlen, ext) != 0)
46 + /* Now score depends on similarity of prefix */
47 + for (; *name == *basename && *name; name++, basename++)
53 +static int find_fuzzy(const char *fname, char *buf, STRUCT_STAT *st_ptr)
57 + char *basename, *dirname;
58 + char mangled_name[MAXPATHLEN];
59 + char bestname[MAXPATHLEN];
60 + unsigned int bestscore = 0;
63 + strlcpy(mangled_name, fname, sizeof mangled_name);
65 + split_names(mangled_name, &dirname, &basename);
66 + if (!(d = opendir(dirname))) {
67 + rsyserr(FERROR, errno, "recv_generator opendir(%s)", dirname);
71 + /* Get final extension, eg. .gz; never full basename though. */
72 + if (!(ext = strrchr(basename + 1, '.')))
73 + ext = basename + strlen(basename); /* ext = "" */
75 + while ((di = readdir(d)) != NULL) {
76 + const char *dname = d_name(di);
79 + if (dname[0] == '.' && (dname[1] == '\0'
80 + || (dname[1] == '.' && dname[2] == '\0')))
83 + score = measure_name(dname, basename, ext);
85 + rprintf(FINFO, "fuzzy score for %s = %u\n",
88 + if (score > bestscore) {
89 + strlcpy(bestname, dname, sizeof bestname);
95 + /* Found a candidate. */
96 + if (bestscore != 0) {
97 + pathjoin(buf, MAXPATHLEN, dirname, bestname);
99 + rprintf(FINFO, "fuzzy match %s->%s\n", fname, buf);
100 + return link_stat(buf, st_ptr, 0);
107 * Acts on file number @p i from @p flist, whose name is @p fname.
108 @@ -493,6 +578,15 @@ static void recv_generator(char *fname,
112 + if (statret == -1 && fuzzy_basis) {
113 + if (find_fuzzy(fname, fnamecmpbuf, &st) == 0
114 + && S_ISREG(st.st_mode)) {
116 + fnamecmp = fnamecmpbuf;
117 + fnamecmp_type = FNAMECMP_FUZZY;
122 if (preserve_hard_links && hard_link_check(file, HL_SKIP))
124 @@ -521,6 +615,8 @@ static void recv_generator(char *fname,
126 if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
128 + else if (fnamecmp_type == FNAMECMP_FUZZY)
130 else if (unchanged_file(fnamecmp, file, &st)) {
131 if (fnamecmp_type == FNAMECMP_FNAME)
132 set_perms(fname, file, &st, PERMS_REPORT);
133 @@ -593,8 +689,24 @@ prepare_to_open:
137 - if (f_out_name >= 0)
138 + if (f_out_name >= 0) {
139 write_byte(f_out_name, fnamecmp_type);
140 + if (fnamecmp_type == FNAMECMP_FUZZY) {
141 + uchar lenbuf[3], *lb = lenbuf;
142 + int len = strlen(fnamecmpbuf);
144 +#if MAXPATHLEN > 0x7FFF
145 + *lb++ = len / 0x10000 + 0x80;
146 + *lb++ = len / 0x100;
148 + *lb++ = len / 0x100 + 0x80;
152 + write_buf(f_out_name, lenbuf, lb - lenbuf + 1);
153 + write_buf(f_out_name, fnamecmpbuf, len);
157 if (dry_run || read_batch)
159 --- orig/main.c 2005-01-14 18:30:18
160 +++ main.c 2005-01-14 18:33:15
161 @@ -48,6 +48,7 @@ extern int keep_dirlinks;
162 extern int preserve_hard_links;
163 extern int protocol_version;
165 +extern int fuzzy_basis;
166 extern int relative_paths;
167 extern int rsync_port;
168 extern int whole_file;
169 @@ -464,7 +465,8 @@ static int do_recv(int f_in,int f_out,st
172 int error_pipe[2], name_pipe[2];
173 - BOOL need_name_pipe = (basis_dir[0] || partial_dir) && !dry_run;
174 + BOOL need_name_pipe = (basis_dir[0] || partial_dir || fuzzy_basis)
177 /* The receiving side mustn't obey this, or an existing symlink that
178 * points to an identical file won't be replaced by the referent. */
179 --- orig/options.c 2005-01-15 21:23:15
180 +++ options.c 2005-01-15 21:08:13
181 @@ -86,6 +86,7 @@ int copy_unsafe_links = 0;
183 int daemon_bwlimit = 0;
185 +int fuzzy_basis = 0;
186 size_t bwlimit_writemax = 0;
187 int delete_after = 0;
188 int only_existing = 0;
189 @@ -288,6 +289,7 @@ void usage(enum logcode F)
190 rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
191 rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n");
192 rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n");
193 + rprintf(F," --fuzzy find similar file for basis when no dest file\n");
194 rprintf(F," -P equivalent to --partial --progress\n");
195 rprintf(F," -z, --compress compress file data\n");
196 rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n");
197 @@ -384,6 +386,7 @@ static struct poptOption long_options[]
198 {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
199 {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
200 {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
201 + {"fuzzy", 0, POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 },
202 /* TODO: Should this take an optional int giving the compression level? */
203 {"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 },
204 {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 },
205 @@ -952,10 +955,10 @@ int parse_arguments(int *argc, const cha
210 + if (dest_option || fuzzy_basis) {
211 snprintf(err_buf, sizeof err_buf,
212 "--inplace does not yet work with %s\n",
214 + dest_option ? dest_option : "--fuzzy");
218 @@ -1240,6 +1243,9 @@ void server_options(char **args,int *arg
219 args[ac++] = "--no-relative";
222 + if (fuzzy_basis && am_sender)
223 + args[ac++] = "--fuzzy";
228 --- orig/receiver.c 2005-01-15 21:18:09
229 +++ receiver.c 2005-01-15 21:21:02
230 @@ -324,6 +324,27 @@ static int receive_data(int f_in, char *
234 +static void read_gen_name(int fd, char *buf)
236 + int len = read_byte(fd);
238 +#if MAXPATHLEN > 32767
240 + read_buf(fd, (char *)lenbuf, 2);
241 + len = (len & ~0x80) * 0x10000 + lenbuf[0] * 0x100 + lenbuf[1];
243 + len = (len & ~0x80) * 0x100 + read_byte(fd);
246 + if (len >= MAXPATHLEN) {
247 + rprintf(FERROR, "bogus data on generator name pipe\n");
248 + exit_cleanup(RERR_PROTOCOL);
251 + read_sbuf(fd, buf, len);
255 static void discard_receive_data(int f_in, OFF_T length)
257 receive_data(f_in, NULL, -1, 0, NULL, -1, length);
258 @@ -454,6 +475,10 @@ int recv_files(int f_in, struct file_lis
259 case FNAMECMP_BACKUP:
260 fnamecmp = get_backup_name(fname);
262 + case FNAMECMP_FUZZY:
263 + read_gen_name(f_in_name, fnamecmpbuf);
264 + fnamecmp = fnamecmpbuf;
267 if (j >= basis_dir_cnt) {
269 --- orig/rsync.h 2005-01-15 21:18:09
270 +++ rsync.h 2005-01-15 21:24:09
272 #define FNAMECMP_FNAME 0x80
273 #define FNAMECMP_PARTIAL_DIR 0x81
274 #define FNAMECMP_BACKUP 0x82
275 +#define FNAMECMP_FUZZY 0x83
278 /* Log-message categories. FLOG is only used on the daemon side to
279 --- orig/rsync.yo 2005-01-15 04:36:32
280 +++ rsync.yo 2005-01-15 21:48:52
281 @@ -358,6 +358,7 @@ verb(
282 --compare-dest=DIR also compare received files relative to DIR
283 --copy-dest=DIR ... and include copies of unchanged files
284 --link-dest=DIR hardlink to files in DIR when unchanged
285 + --fuzzy find similar file for basis when no dest
286 -P equivalent to --partial --progress
287 -z, --compress compress file data
288 -C, --cvs-exclude auto ignore files in the same way CVS does
289 @@ -876,6 +877,11 @@ Note that rsync versions prior to 2.6.1
290 (or implied by -a). If the receiving rsync is not new enough, you can work
291 around this bug by avoiding the -o option.
293 +dit(bf(--fuzzy)) This option tells rsync that it should look around for a
294 +basis file for any destination file that is missing. The current algorithm
295 +looks for a similarly-named file in the same directory as the destination
296 +file, and, if found, uses that to try to speed up the transfer.
298 dit(bf(-z, --compress)) With this option, rsync compresses any data from
299 the files that it sends to the destination machine. This
300 option is useful on slow connections. The compression method used is the