-Depends-On-Patch: g2r-basis-filename.diff
-
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.
+Lightly tested.
Be sure to run "make proto" before "make".
---- orig/generator.c 2004-09-20 19:57:58
-+++ generator.c 2004-09-23 15:33:08
-@@ -43,6 +43,7 @@ extern int ignore_times;
- extern int size_only;
+--- 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 *compare_dest;
-@@ -244,6 +245,92 @@ static void generate_and_send_sums(int f
+ extern char *basis_dir[];
+@@ -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.
-@@ -256,11 +343,11 @@ static void generate_and_send_sums(int f
- static void recv_generator(char *fname, struct file_struct *file, int i,
- int f_out, int f_out_name)
- {
-- int fd = -1, f_copy;
-+ int fd = -1, f_copy = -1;
- STRUCT_STAT st, partial_st;
-- struct file_struct *back_file;
-+ struct file_struct *back_file = NULL;
- int statret, stat_errno;
-- char *fnamecmp, *partialptr, *backupptr;
-+ char *fnamecmp, *partialptr, *backupptr = NULL;
- char fnamecmpbuf[MAXPATHLEN];
- uchar fnamecmp_type;
-
-@@ -468,6 +555,15 @@ static void recv_generator(char *fname,
+@@ -493,6 +578,15 @@ static void recv_generator(char *fname,
} else
partialptr = NULL;
+ && S_ISREG(st.st_mode)) {
+ statret = 0;
+ fnamecmp = fnamecmpbuf;
-+ fnamecmp_type = G2R_FUZZY;
++ fnamecmp_type = FNAMECMP_FUZZY;
+ }
+ }
+
if (statret == -1) {
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
-@@ -494,7 +590,7 @@ static void recv_generator(char *fname,
- return;
- }
+@@ -521,6 +615,8 @@ static void recv_generator(char *fname,
-- if (skip_file(fnamecmp, file, &st)) {
-+ if (fnamecmp_type != G2R_FUZZY && skip_file(fnamecmp, file, &st)) {
- if (fnamecmp_type == G2R_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);
- return;
-@@ -553,10 +649,6 @@ prepare_to_open:
- return;
- }
- fnamecmp_type = G2R_BACKUP;
-- } else {
-- backupptr = NULL;
-- back_file = NULL;
-- f_copy = -1;
- }
+@@ -593,8 +689,24 @@ prepare_to_open:
- if (verbose > 3) {
-@@ -570,6 +662,21 @@ prepare_to_open:
notify_others:
- if (f_out_name >= 0) {
+ 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 == G2R_FUZZY) {
++ if (fnamecmp_type == FNAMECMP_FUZZY) {
+ uchar lenbuf[3], *lb = lenbuf;
+ int len = strlen(fnamecmpbuf);
+ if (len > 0x7F) {
+ write_buf(f_out_name, lenbuf, lb - lenbuf + 1);
+ write_buf(f_out_name, fnamecmpbuf, len);
+ }
- io_flush(NORMAL_FLUSH); /* XXX make this more efficient! */
- }
++ }
---- orig/main.c 2004-07-22 00:10:43
-+++ main.c 2004-07-22 00:32:31
+ 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 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 = compare_dest && !dry_run;
-+ BOOL need_name_pipe = (compare_dest || 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-09-23 17:42:07
-+++ options.c 2004-09-23 14:59:46
-@@ -85,6 +85,7 @@ int safe_symlinks = 0;
- int copy_unsafe_links = 0;
+--- 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;
-@@ -279,6 +280,7 @@ void usage(enum logcode F)
- rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n");
+@@ -288,6 +289,7 @@ void usage(enum logcode F)
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," --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");
-@@ -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 },
+@@ -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 },
- {"daemon", 0, POPT_ARG_NONE, &daemon_opt, 0, 0, 0 },
-@@ -833,6 +836,11 @@ int parse_arguments(int *argc, const cha
- link_dest ? "--link-dest" : "--compare-dest");
+ {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 },
+@@ -952,10 +955,10 @@ int parse_arguments(int *argc, const cha
return 0;
}
-+ if (compare_dest) {
-+ snprintf(err_buf, sizeof err_buf,
-+ "--inplace does not yet work with --fuzzy\n");
-+ return 0;
-+ }
- } else {
- if (keep_partial && !partial_dir)
- partial_dir = getenv("RSYNC_PARTIAL_DIR");
-@@ -1099,6 +1107,9 @@ void server_options(char **args,int *arg
+ 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_basis && am_sender)
*argc = ac;
return;
---- orig/receiver.c 2004-09-07 21:57:20
-+++ receiver.c 2004-07-30 18:21:38
-@@ -319,6 +319,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);
-@@ -448,6 +469,10 @@ int recv_files(int f_in, struct file_lis
- case G2R_BACKUP:
+@@ -454,6 +475,10 @@ int recv_files(int f_in, struct file_lis
+ case FNAMECMP_BACKUP:
fnamecmp = get_backup_name(fname);
break;
-+ case G2R_FUZZY:
++ case FNAMECMP_FUZZY:
+ read_gen_name(f_in_name, fnamecmpbuf);
+ fnamecmp = fnamecmpbuf;
+ break;
default:
- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
- compare_dest, fname);
---- orig/rsync.h 2004-09-07 21:52:22
-+++ rsync.h 2004-09-07 22:02:37
-@@ -122,6 +122,7 @@
- #define G2R_FNAME 0x80
- #define G2R_PARTIAL_DIR 0x81
- #define G2R_BACKUP 0x82
-+#define G2R_FUZZY 0x83
+ 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
/* Log-message categories. FLOG is only used on the daemon side to
---- orig/rsync.yo 2004-09-24 16:42:30
-+++ rsync.yo 2004-07-03 19:27:25
-@@ -356,6 +356,7 @@ verb(
- -T --temp-dir=DIR create temporary files in directory DIR
+--- 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
- --link-dest=DIR create hardlinks to DIR for unchanged files
-+ --fuzzy use similar file as basis if basis is gone
+ --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