Fixed failing hunks and/or fuzz.

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

From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 03 Apr 2002 17:08:57 +1000

Found old patch on google, and updated it for 2.5.4 (I know, but that's what
apt-get source gave me).

Compiles, otherwise untested.
Rusty.

[Updated for current CVS version by Wayne Davison.  Passes *MOST* of the
test suite, but otherwise UNTESTED.]
--
  Anyone who quotes me in their sig is an idiot. -- Rusty Russell.

--- Makefile.in	15 May 2004 00:48:11 -0000	1.101
+++ Makefile.in	15 May 2004 20:47:12 -0000
@@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
 	zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
 	zlib/zutil.o zlib/adler32.o
 OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
-	main.o checksum.o match.o syscall.o log.o backup.o
+	main.o checksum.o match.o syscall.o log.o backup.o alternate.o
 OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
 	fileio.o batch.o clientname.o
 OBJS3=progress.o pipe.o
--- generator.c	15 May 2004 19:31:10 -0000	1.83
+++ generator.c	15 May 2004 20:47:12 -0000
@@ -51,6 +51,7 @@ extern int list_only;
 extern int only_existing;
 extern int orig_umask;
 extern int safe_symlinks;
+extern int fuzzy;
 
 
 /* choose whether to skip a particular file */
@@ -256,7 +257,61 @@ static void generate_and_send_sums(struc
 	}
 }
 
+/* Returns -1 for can't open (null file), -2 for skip */
+static int open_base_file(struct file_struct *file, char *fname, int statret,
+			  STRUCT_STAT *st)
+{
+	int fd = -1;
+
+	if (statret == 0) {
+		if (S_ISREG(st->st_mode)) {
+			if (update_only
+			    && cmp_modtime(st->st_mtime, file->modtime) > 0) {
+				if (verbose > 1)
+					rprintf(FINFO, "%s is newer\n", fname);
+				return -2;
+			}
+			if (skip_file(fname, file, st)) {
+				set_perms(fname, file, st, PERMS_REPORT);
+				return -2;
+			}
+		 	fd = do_open(fname, O_RDONLY, 0);
+			if (fd == -1) {
+				rsyserr(FERROR, errno, "failed to open %s, continuing",
+				    full_fname(fname));
+				return -1;
+			}
+			return fd;
+		} else {
+			/* Try to use symlink contents */
+			if (S_ISLNK(st->st_mode)) {
+				fd = do_open_regular(fname);
+				/* Don't delete yet; receiver will need it */
+			} else {
+				if (delete_file(fname) != 0) {
+					if (fd != -1)
+						close(fd);
+					return -2;
+				}
+			}
+		}
+	}
+
+	if (fd == -1 && compare_dest != NULL)
+		fd = open_alternate_base_comparedir(fname);
 
+	if (fd == -1 && fuzzy)
+		fd = open_alternate_base_fuzzy(fname);
+
+	/* Update stat to understand size */
+	if (fd != -1) {
+		if (do_fstat(fd, st) != 0) {
+			rsyserr(FERROR, errno, "fstat %s", full_fname(fname));
+		}
+	}
+
+	return fd;
+}
 
 /**
  * Acts on file number @p i from @p flist, whose name is @p fname.
@@ -272,8 +327,6 @@ void recv_generator(char *fname, struct 
 	STRUCT_STAT st;
 	struct map_struct *mapbuf;
 	int statret;
-	char *fnamecmp;
-	char fnamecmpbuf[MAXPATHLEN];
 
 	if (list_only)
 		return;
@@ -400,107 +453,39 @@ void recv_generator(char *fname, struct 
 	}
 #endif
 
-	if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER))
-		return;
-
-	if (!S_ISREG(file->mode)) {
-		rprintf(FINFO, "skipping non-regular file \"%s\"\n",fname);
-		return;
-	}
-
-	fnamecmp = fname;
-
-	if (statret == -1 && compare_dest != NULL) {
-		/* try the file at compare_dest instead */
-		int saveerrno = errno;
-		pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, compare_dest, fname);
-		statret = link_stat(fnamecmpbuf,&st);
-		if (!S_ISREG(st.st_mode))
-			statret = -1;
-		if (statret == -1)
-			errno = saveerrno;
-#if HAVE_LINK
-		else if (link_dest && !dry_run) {
-			if (do_link(fnamecmpbuf, fname) != 0) {
-				if (verbose > 0) {
-					rsyserr(FINFO, errno, "link %s => %s",
-						fnamecmpbuf, fname);
-				}
-			}
-			fnamecmp = fnamecmpbuf;
-		}
-#endif
-		else
-			fnamecmp = fnamecmpbuf;
-	}
-
-	if (statret == -1) {
-		if (preserve_hard_links && hard_link_check(file, HL_SKIP))
-			return;
-		if (errno == ENOENT) {
-			write_int(f_out,i);
-			if (!dry_run) write_sum_head(f_out, NULL);
-		} else if (verbose > 1) {
+	/* Failed to stat for some reason besides "not found". */
+	if (statret == -1 && errno != ENOENT) {
+		if (verbose > 1) {
 			rsyserr(FERROR, errno,
-				"recv_generator: failed to open %s",
+				"recv_generator failed to stat %s",
 				full_fname(fname));
 		}
 		return;
 	}
 
-	if (!S_ISREG(st.st_mode)) {
-		if (delete_file(fname) != 0) {
-			return;
-		}
-
-		/* now pretend the file didn't exist */
-		if (preserve_hard_links && hard_link_check(file, HL_SKIP))
-			return;
-		write_int(f_out,i);
-		if (!dry_run) write_sum_head(f_out, NULL);
-		return;
-	}
-
-	if (opt_ignore_existing && fnamecmp == fname) {
-		if (verbose > 1)
-			rprintf(FINFO,"%s exists\n",fname);
+	if ((fd = open_base_file(file, fname, statret, &st)) == -2)
 		return;
-	}
 
-	if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
-		if (verbose > 1)
-			rprintf(FINFO,"%s is newer\n",fname);
-		return;
+	if ((disable_deltas_p() || dry_run) && fd != -1) {
+		close(fd);
+		fd = -1;
 	}
 
-	if (skip_file(fname, file, &st)) {
-		if (fnamecmp == fname)
-			set_perms(fname, file, &st, PERMS_REPORT);
-		return;
-	}
-
-	if (dry_run) {
-		write_int(f_out,i);
-		return;
-	}
-
-	if (disable_deltas_p()) {
-		write_int(f_out,i);
-		write_sum_head(f_out, NULL);
-		return;
-	}
-
-	/* open the file */
-	fd = do_open(fnamecmp, O_RDONLY, 0);
-
 	if (fd == -1) {
-		rsyserr(FERROR, errno, "failed to open %s, continuing",
-			full_fname(fnamecmp));
-		/* pretend the file didn't exist */
+		/* the file didn't exist, or we can pretend it doesn't */
 		if (preserve_hard_links && hard_link_check(file, HL_SKIP))
 			return;
-		write_int(f_out,i);
-		write_sum_head(f_out, NULL);
+ 		write_int(f_out, i);
+		if (!dry_run)
+			write_sum_head(f_out, NULL);
+ 		return;
+ 	}
+
+	if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER))
+		return;
+
+	if (!S_ISREG(file->mode)) {
+		rprintf(FINFO, "skipping non-regular file \"%s\"\n",fname);
 		return;
 	}
 
@@ -510,7 +495,7 @@ void recv_generator(char *fname, struct 
 		mapbuf = NULL;
 
 	if (verbose > 3) {
-		rprintf(FINFO,"gen mapped %s of size %.0f\n", fnamecmp,
+		rprintf(FINFO, "gen mapped %s of size %.0f\n", fname,
 			(double)st.st_size);
 	}
 
--- options.c	6 May 2004 21:08:01 -0000	1.148
+++ options.c	15 May 2004 20:47:13 -0000
@@ -91,6 +91,7 @@ int ignore_errors = 0;
 int modify_window = 0;
 int blocking_io = -1;
 int checksum_seed = 0;
+int fuzzy = 0;
 unsigned int block_size = 0;
 
 
@@ -290,6 +291,7 @@ void usage(enum logcode F)
   rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth, KBytes per second\n");
   rprintf(F,"     --write-batch=PREFIX    write batch fileset starting with PREFIX\n");
   rprintf(F,"     --read-batch=PREFIX     read batch fileset starting with PREFIX\n");
+  rprintf(F,"     --fuzzy                 use similar file as basis if it does't exist\n");
 #ifdef INET6
   rprintf(F," -4  --ipv4                  prefer IPv4\n");
   rprintf(F," -6  --ipv6                  prefer IPv6\n");
@@ -385,6 +387,7 @@ static struct poptOption long_options[] 
   {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
   {"from0",           '0', POPT_ARG_NONE,   &eol_nulls, 0, 0, 0},
   {"no-implied-dirs",  0,  POPT_ARG_VAL,    &implied_dirs, 0, 0, 0 },
+  {"fuzzy",            0,  POPT_ARG_NONE,   &fuzzy, 0, 0, 0 },
   {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
 #ifdef INET6
   {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
@@ -964,6 +967,9 @@ void server_options(char **args,int *arg
 			args[ac++] = "--from0";
 		}
 	}
+
+	if (fuzzy && am_sender)
+		args[ac++] = "--fuzzy";
 
 	*argc = ac;
 	return;
--- receiver.c	15 May 2004 19:31:10 -0000	1.78
+++ receiver.c	15 May 2004 20:47:13 -0000
@@ -46,6 +46,7 @@ extern int module_id;
 extern int ignore_errors;
 extern int orig_umask;
 extern int keep_partial;
+extern int fuzzy;
 
 static void delete_one(char *fn, int is_dir)
 {
@@ -294,8 +295,6 @@ int recv_files(int f_in,struct file_list
 	char *fname, fbuf[MAXPATHLEN];
 	char template[MAXPATHLEN];
 	char fnametmp[MAXPATHLEN];
-	char *fnamecmp;
-	char fnamecmpbuf[MAXPATHLEN];
 	struct map_struct *mapbuf;
 	int i;
 	struct file_struct *file;
@@ -358,35 +357,31 @@ int recv_files(int f_in,struct file_list
 		if (verbose > 2)
 			rprintf(FINFO,"recv_files(%s)\n",fname);
 
-		fnamecmp = fname;
-
 		/* open the file */
-		fd1 = do_open(fnamecmp, O_RDONLY, 0);
+		fd1 = do_open(fname, O_RDONLY, 0);
 
-		if (fd1 == -1 && compare_dest != NULL) {
-			/* try the file at compare_dest instead */
-			pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-				 compare_dest, fname);
-			fnamecmp = fnamecmpbuf;
-			fd1 = do_open(fnamecmp, O_RDONLY, 0);
-		}
+		if (fd1 == -1 && compare_dest != NULL)
+			fd1 = open_alternate_base_comparedir(fname);
+
+		if (fd1 == -1 && fuzzy)
+			fd1 = open_alternate_base_fuzzy(fname);
 
 		if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
 			rsyserr(FERROR, errno, "fstat %s failed",
-				full_fname(fnamecmp));
+				full_fname(fname));
 			receive_data(f_in,NULL,-1,NULL,file->length);
 			close(fd1);
 			continue;
 		}
 
-		if (fd1 != -1 && S_ISDIR(st.st_mode) && fnamecmp == fname) {
+		if (fd1 != -1 && S_ISDIR(st.st_mode)) {
 			/* this special handling for directories
 			 * wouldn't be necessary if robust_rename()
 			 * and the underlying robust_unlink could cope
 			 * with directories
 			 */
 			rprintf(FERROR,"recv_files: %s is a directory\n",
-				full_fname(fnamecmp));
+				full_fname(fname));
 			receive_data(f_in, NULL, -1, NULL, file->length);
 			close(fd1);
 			continue;
@@ -407,8 +402,10 @@ int recv_files(int f_in,struct file_list
 
 		if (fd1 != -1 && st.st_size > 0) {
 			mapbuf = map_file(fd1,st.st_size);
-			if (verbose > 2)
-				rprintf(FINFO,"recv mapped %s of size %.0f\n",fnamecmp,(double)st.st_size);
+			if (verbose > 2) {
+				rprintf(FINFO, "recv mapped %s of size %.0f\n",
+				    fname, (double)st.st_size);
+			}
 		} else
 			mapbuf = NULL;