[rsync/rsync-patches.git] / fuzzy.diff

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.

Be sure to run "make proto" before "make".

--- orig/generator.c	2004-07-22 00:05:38
+++ generator.c	2004-07-20 21:49:24
@@ -41,6 +41,7 @@ extern int ignore_times;
 extern int size_only;
 extern int io_timeout;
 extern int protocol_version;
+extern int fuzzy;
 extern int always_checksum;
 extern char *compare_dest;
 extern int link_dest;
@@ -248,6 +249,94 @@ 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)
+{
+	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;
+	}
+
+	/* 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 (dname[0] == '.' && (dname[1] == '\0'
+		    || (dname[1] == '.' && dname[2] == '\0')))
+			continue;
+
+		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;
+		}
+	}
+	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.
@@ -262,7 +351,7 @@ static void recv_generator(char *fname, 
 {
 	int fd = -1;
 	STRUCT_STAT st;
-	int statret;
+	int statret, fuzzy_file = 0;
 	char *fnamecmp;
 	char fnamecmpbuf[MAXPATHLEN];
 
@@ -441,6 +530,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 == -1) {
 		if (preserve_hard_links && hard_link_check(file, HL_SKIP))
 			return;
@@ -478,7 +575,7 @@ static void recv_generator(char *fname, 
 		return;
 	}
 
-	if (skip_file(fname, file, &st)) {
+	if (!fuzzy_file && skip_file(fname, file, &st)) {
 		if (!*fnamecmpbuf)
 			set_perms(fname, file, &st, PERMS_REPORT);
 		return;
--- 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-23 17:16:13
+++ 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;
 size_t bwlimit_writemax = 0;
 int delete_after = 0;
 int only_existing = 0;
@@ -277,6 +278,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");
@@ -376,6 +378,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 },
+  {"fuzzy",            0,  POPT_ARG_NONE,   &fuzzy, 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 },
@@ -1025,6 +1028,9 @@ void server_options(char **args,int *arg
 		}
 	}
 
+	if (fuzzy && am_sender)
+		args[ac++] = "--fuzzy";
+
 	*argc = ac;
 	return;
 
--- orig/receiver.c	2004-07-22 00:20:50
+++ receiver.c	2004-07-03 20:09:05
@@ -38,7 +38,6 @@ extern int preserve_perms;
 extern int cvs_exclude;
 extern int io_error;
 extern char *tmpdir;
-extern char *compare_dest;
 extern int make_backups;
 extern int do_progress;
 extern char *backup_dir;
--- orig/rsync.yo	2004-07-23 17:16:13
+++ rsync.yo	2004-07-03 19:27:25
@@ -326,6 +326,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
+     --fuzzy                 use similar file as basis if basis is gone
  -P                          equivalent to --partial --progress
  -z, --compress              compress file data
  -C, --cvs-exclude           auto ignore files in the same way CVS does
Commit	Line	Data
824abc86	1	Depends-On-Patch: g2r-basis-filename.diff
8c5b8235	2
824abc86	3	The changes to generator.c were greatly simplified, making the patch
8c5b8235	4	easier to maintain and fixing the failing test in the testsuite.
58118c25	5	Very lightly tested.
241013b4	6
824abc86 WD	7	Be sure to run "make proto" before "make".
824abc86 WD	8
2f5fa77e	9	--- orig/generator.c 2004-07-22 00:05:38
dc3ae351	10	+++ generator.c 2004-07-20 21:49:24
58118c25 WD	11	@@ -41,6 +41,7 @@ extern int ignore_times;
	12	extern int size_only;
	13	extern int io_timeout;
	14	extern int protocol_version;
	15	+extern int fuzzy;
	16	extern int always_checksum;
	17	extern char *compare_dest;
	18	extern int link_dest;
dc3ae351	19	@@ -248,6 +249,94 @@ static void generate_and_send_sums(int f
58118c25 WD	20	}
	21
	22
47dd7a31 WD	23	+static void split_names(char fname, char dirname, char *basename)
	24	+{
	25	+ char *slash = strrchr(fname, '/');
	26	+ if (slash) {
	27	+ *dirname = fname;
	28	+ *slash = '\0';
	29	+ *basename = slash+1;
	30	+ } else {
	31	+ *basename = fname;
	32	+ *dirname = ".";
	33	+ }
	34	+}
	35	+
58118c25	36	+
47dd7a31 WD	37	+static unsigned int measure_name(const char name, const char basename,
	38	+ const char *ext)
	39	+{
	40	+ int namelen = strlen(name);
	41	+ int extlen = strlen(ext);
	42	+ unsigned int score = 0;
	43	+
	44	+ /* Extensions must match */
	45	+ if (namelen <= extlen \|\| strcmp(name + namelen - extlen, ext) != 0)
	46	+ return 0;
	47	+
	48	+ /* Now score depends on similarity of prefix */
	49	+ for (; name == basename && *name; name++, basename++)
	50	+ score++;
	51	+ return score;
	52	+}
	53	+
58118c25 WD	54	+
58118c25 WD	55	+static int find_fuzzy(char *fname_ptr, char buf, STRUCT_STAT *st_ptr)
47dd7a31 WD	56	+{
	57	+ DIR *d;
	58	+ struct dirent *di;
	59	+ char basename, dirname;
	60	+ char mangled_name[MAXPATHLEN];
	61	+ char bestname[MAXPATHLEN];
	62	+ unsigned int bestscore = 0;
	63	+ const char *ext;
	64	+
8c5b8235	65	+ strlcpy(mangled_name, *fname_ptr, sizeof mangled_name);
47dd7a31 WD	66	+
	67	+ split_names(mangled_name, &dirname, &basename);
	68	+ if (!(d = opendir(dirname))) {
	69	+ rsyserr(FERROR, errno, "recv_generator opendir(%s)", dirname);
	70	+ return -1;
	71	+ }
	72	+
	73	+ /* Get final extension, eg. .gz; never full basename though. */
	74	+ ext = strrchr(basename + 1, '.');
	75	+ if (!ext)
	76	+ ext = basename + strlen(basename); /* ext = "" */
	77	+
	78	+ while ((di = readdir(d)) != NULL) {
	79	+ const char *dname = d_name(di);
	80	+ unsigned int score;
	81	+
	82	+ if (dname[0] == '.' && (dname[1] == '\0'
	83	+ \|\| (dname[1] == '.' && dname[2] == '\0')))
	84	+ continue;
	85	+
	86	+ score = measure_name(dname, basename, ext);
	87	+ if (verbose > 4) {
8c5b8235 WD	88	+ rprintf(FINFO, "[%s] fuzzy score for %s = %u\n",
8c5b8235 WD	89	+ who_am_i(), dname, score);
47dd7a31 WD	90	+ }
47dd7a31 WD	91	+ if (score > bestscore) {
8c5b8235	92	+ strlcpy(bestname, dname, sizeof bestname);
47dd7a31 WD	93	+ bestscore = score;
	94	+ }
	95	+ }
	96	+ closedir(d);
	97	+
	98	+ /* Found a candidate. */
	99	+ if (bestscore != 0) {
8c5b8235	100	+ pathjoin(buf, MAXPATHLEN, dirname, bestname);
47dd7a31	101	+ if (verbose > 2) {
8c5b8235 WD	102	+ rprintf(FINFO, "[%s] fuzzy match %s->%s\n",
8c5b8235 WD	103	+ who_am_i(), *fname_ptr, buf);
47dd7a31	104	+ }
8c5b8235	105	+ *fname_ptr = buf;
58118c25	106	+ return link_stat(buf, st_ptr, 0);
47dd7a31 WD	107	+ }
	108	+ return -1;
	109	+}
58118c25 WD	110	+
	111
	112	/*
	113	* Acts on file number @p i from @p flist, whose name is @p fname.
dc3ae351 WD	114	@@ -262,7 +351,7 @@ static void recv_generator(char *fname,
dc3ae351 WD	115	{
495f1899	116	int fd = -1;
f74d2272	117	STRUCT_STAT st;
8c5b8235 WD	118	- int statret;
	119	+ int statret, fuzzy_file = 0;
	120	char *fnamecmp;
	121	char fnamecmpbuf[MAXPATHLEN];
54691942	122
c2530f70	123	@@ -441,6 +530,14 @@ static void recv_generator(char *fname,
824abc86 WD	124	} else
	125	*fnamecmpbuf = '\0';
	126
8c5b8235	127	+ if (statret == -1 && fuzzy) {
58118c25	128	+ statret = find_fuzzy(&fnamecmp, fnamecmpbuf, &st);
8c5b8235 WD	129	+ if (!S_ISREG(st.st_mode))
	130	+ statret = -1;
	131	+ else
	132	+ fuzzy_file = 1;
824abc86 WD	133	+ }
824abc86 WD	134	+
8c5b8235	135	if (statret == -1) {
7628f156 WD	136	if (preserve_hard_links && hard_link_check(file, HL_SKIP))
7628f156 WD	137	return;
c2530f70	138	@@ -478,7 +575,7 @@ static void recv_generator(char *fname,
241013b4 MP	139	return;
	140	}
	141
8c5b8235 WD	142	- if (skip_file(fname, file, &st)) {
8c5b8235 WD	143	+ if (!fuzzy_file && skip_file(fname, file, &st)) {
824abc86	144	if (!*fnamecmpbuf)
8c5b8235 WD	145	set_perms(fname, file, &st, PERMS_REPORT);
8c5b8235 WD	146	return;
2f5fa77e WD	147	--- orig/main.c 2004-07-22 00:10:43
2f5fa77e WD	148	+++ main.c 2004-07-22 00:32:31
495f1899 WD	149	@@ -47,6 +47,7 @@ extern int keep_dirlinks;
	150	extern int preserve_hard_links;
	151	extern int protocol_version;
	152	extern int recurse;
	153	+extern int fuzzy;
	154	extern int relative_paths;
	155	extern int rsync_port;
	156	extern int whole_file;
c2530f70	157	@@ -458,7 +459,7 @@ static int do_recv(int f_in,int f_out,st
495f1899 WD	158	int pid;
	159	int status = 0;
	160	int error_pipe[2], name_pipe[2];
c2530f70 WD	161	- BOOL need_name_pipe = compare_dest && !dry_run;
c2530f70 WD	162	+ BOOL need_name_pipe = (compare_dest \|\| fuzzy) && !dry_run;
495f1899 WD	163
	164	if (preserve_hard_links)
	165	init_hard_links(flist);
c2530f70	166	--- orig/options.c 2004-07-23 17:16:13
f6c3b300 WD	167	+++ options.c 2004-07-16 20:14:12
	168	@@ -85,6 +85,7 @@ int safe_symlinks = 0;
	169	int copy_unsafe_links = 0;
	170	int size_only = 0;
	171	int bwlimit = 0;
f74d2272	172	+int fuzzy = 0;
f6c3b300 WD	173	size_t bwlimit_writemax = 0;
	174	int delete_after = 0;
	175	int only_existing = 0;
c2530f70 WD	176	@@ -277,6 +278,7 @@ void usage(enum logcode F)
c2530f70 WD	177	rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n");
f0533c4c WD	178	rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
	179	rprintf(F," --link-dest=DIR create hardlinks to DIR for unchanged files\n");
	180	+ rprintf(F," --fuzzy use similar file as basis if basis doesn't exist\n");
	181	rprintf(F," -P equivalent to --partial --progress\n");
	182	rprintf(F," -z, --compress compress file data\n");
	183	rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n");
c2530f70	184	@@ -376,6 +378,7 @@ static struct poptOption long_options[]
f0533c4c WD	185	{"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
	186	{"compare-dest", 0, POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
	187	{"link-dest", 0, POPT_ARG_STRING, &compare_dest, OPT_LINK_DEST, 0, 0 },
f74d2272	188	+ {"fuzzy", 0, POPT_ARG_NONE, &fuzzy, 0, 0, 0 },
f0533c4c WD	189	/* TODO: Should this take an optional int giving the compression level? */
	190	{"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 },
	191	{"daemon", 0, POPT_ARG_NONE, &daemon_opt, 0, 0, 0 },
c2530f70	192	@@ -1025,6 +1028,9 @@ void server_options(char *args,int arg
f74d2272	193	}
241013b4	194	}
7b675ff5	195
241013b4 MP	196	+ if (fuzzy && am_sender)
241013b4 MP	197	+ args[ac++] = "--fuzzy";
7b675ff5	198	+
241013b4	199	*argc = ac;
f74d2272	200	return;
7b675ff5	201
2f5fa77e	202	--- orig/receiver.c 2004-07-22 00:20:50
824abc86	203	+++ receiver.c 2004-07-03 20:09:05
2f5fa77e	204	@@ -38,7 +38,6 @@ extern int preserve_perms;
58118c25 WD	205	extern int cvs_exclude;
	206	extern int io_error;
	207	extern char *tmpdir;
	208	-extern char *compare_dest;
	209	extern int make_backups;
	210	extern int do_progress;
	211	extern char *backup_dir;
c2530f70	212	--- orig/rsync.yo 2004-07-23 17:16:13
824abc86	213	+++ rsync.yo 2004-07-03 19:27:25
f6c3b300	214	@@ -326,6 +326,7 @@ verb(
f0533c4c WD	215	-T --temp-dir=DIR create temporary files in directory DIR
	216	--compare-dest=DIR also compare received files relative to DIR
	217	--link-dest=DIR create hardlinks to DIR for unchanged files
	218	+ --fuzzy use similar file as basis if basis is gone
	219	-P equivalent to --partial --progress
	220	-z, --compress compress file data
	221	-C, --cvs-exclude auto ignore files in the same way CVS does