X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ee1d11c495d0083afdad1725860bec7011e8377d..f328e0f3a8a1d4726b0d3315838c6a109d579acb:/generator.c

diff --git a/generator.c b/generator.c
index f645bf75..6d239bac 100644
--- a/generator.c
+++ b/generator.c
@@ -66,6 +66,7 @@ extern int always_checksum;
 extern char *partial_dir;
 extern char *basis_dir[];
 extern int compare_dest;
+extern int copy_dest;
 extern int link_dest;
 extern int whole_file;
 extern int local_server;
@@ -108,10 +109,9 @@ static int delete_item(char *fname, int mode, int flags)
 	int j, dlen, zap_dir, ok;
 	void *save_filters;
 
-	if (max_delete && deletion_count >= max_delete)
-		return -1;
-
 	if (!S_ISDIR(mode)) {
+		if (max_delete && ++deletion_count > max_delete)
+			return 0;
 		if (make_backups && (backup_dir || !is_backup_file(fname)))
 			ok = make_backup(fname);
 		else
@@ -119,11 +119,12 @@ static int delete_item(char *fname, int mode, int flags)
 		if (ok) {
 			if (!(flags & DEL_TERSE))
 				log_delete(fname, mode);
-			deletion_count++;
 			return 0;
 		}
-		if (errno == ENOENT)
+		if (errno == ENOENT) {
+			deletion_count--;
 			return 0;
+		}
 		rsyserr(FERROR, errno, "delete_file: unlink %s failed",
 			full_fname(fname));
 		return -1;
@@ -131,7 +132,8 @@ static int delete_item(char *fname, int mode, int flags)
 
 	zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse))
 		&& !(flags & DEL_NO_RECURSE);
-	if (dry_run && zap_dir) {
+	if ((max_delete && ++deletion_count > max_delete)
+	    || (dry_run && zap_dir)) {
 		ok = 0;
 		errno = ENOTEMPTY;
 	} else if (make_backups && !backup_dir && !is_backup_file(fname)
@@ -142,17 +144,19 @@ static int delete_item(char *fname, int mode, int flags)
 	if (ok) {
 		if (!(flags & DEL_TERSE))
 			log_delete(fname, mode);
-		deletion_count++;
 		return 0;
 	}
-	if (errno == ENOENT)
+	if (errno == ENOENT) {
+		deletion_count--;
 		return 0;
+	}
 	if (!zap_dir || (errno != ENOTEMPTY && errno != EEXIST)) {
 		rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
 			full_fname(fname));
 		return -1;
 	}
 	flags |= DEL_FORCE_RECURSE; /* mark subdir dels as not "in the way" */
+	deletion_count--;
 
 	dlen = strlcpy(buf, fname, MAXPATHLEN);
 	save_filters = push_local_filters(buf, dlen);
@@ -174,13 +178,12 @@ static int delete_item(char *fname, int mode, int flags)
 
 	pop_local_filters(save_filters);
 
-	if (max_delete && deletion_count >= max_delete)
-		return -1;
+	if (max_delete && ++deletion_count > max_delete)
+		return 0;
 
 	if (do_rmdir(fname) == 0) {
 		if (!(flags & DEL_TERSE))
 			log_delete(fname, mode);
-		deletion_count++;
 	} else if (errno != ENOTEMPTY && errno != ENOENT) {
 		rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
 			full_fname(fname));
@@ -201,6 +204,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 {
 	static int min_depth = MAXPATHLEN, cur_depth = -1;
 	static void *filt_array[MAXPATHLEN/2+1];
+	static int already_warned = 0;
 	struct file_list *dirlist;
 	char delbuf[MAXPATHLEN];
 	STRUCT_STAT st;
@@ -223,13 +227,12 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 	if (file->dir.depth >= MAXPATHLEN/2+1)
 		return; /* Impossible... */
 
-	if (max_delete && deletion_count >= max_delete)
-		return;
-
 	if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
+		if (already_warned)
+			return;
 		rprintf(FINFO,
 			"IO error encountered -- skipping file deletion\n");
-		max_delete = -1; /* avoid duplicating the above warning */
+		already_warned = 1;
 		return;
 	}
 
@@ -272,6 +275,9 @@ static void do_delete_pass(struct file_list *flist)
 	char fbuf[MAXPATHLEN];
 	int j;
 
+	if (dry_run > 1) /* destination doesn't exist yet */
+		return;
+
 	for (j = 0; j < flist->count; j++) {
 		struct file_struct *file = flist->files[j];
 
@@ -303,7 +309,7 @@ static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
 
 
 void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
-	     int32 iflags, char *hlink)
+	     int32 iflags, uchar fnamecmp_type, char *xname)
 {
 	if (statret == 0) {
 		if (S_ISREG(file->mode) && file->length != st->st_size)
@@ -324,23 +330,24 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
 			    && st->st_gid != file->gid)
 				iflags |= ITEM_REPORT_GROUP;
 		}
-	} else {
+	} else
 		iflags |= ITEM_IS_NEW;
-		if (!(iflags & (ITEM_HARD_LINKED|ITEM_LOCAL_CHANGE)))
-			iflags |= ITEM_TRANSFER;
-	}
 
 	iflags &= 0xffff;
 	if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
-	  || (hlink && *hlink)) && !read_batch) {
+	  || (xname && *xname)) && !read_batch) {
 		if (protocol_version >= 29) {
+			if (iflags & (ITEM_LOCAL_CHANGE|ITEM_TRANSFER))/* XXX */
+				iflags |= ITEM_DUMMY_BIT; /* XXX Remove soon */
 			if (ndx >= 0)
 				write_int(sock_f_out, ndx);
 			write_shortint(sock_f_out, iflags);
-			if (hlink)
-				write_vstring(sock_f_out, hlink, strlen(hlink));
+			if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
+				write_byte(sock_f_out, fnamecmp_type);
+			if (iflags & ITEM_XNAME_FOLLOWS)
+				write_vstring(sock_f_out, xname, strlen(xname));
 		} else if (ndx >= 0)
-			log_item(file, &stats, iflags, hlink);
+			log_item(file, &stats, iflags, xname);
 	}
 }
 
@@ -380,7 +387,7 @@ static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  * The block size is a rounded square root of file length.
  *
  * The checksum size is determined according to:
- *     blocksum_bits = BLOCKSUM_EXP + 2*log2(file_len) - log2(block_len)
+ *     blocksum_bits = BLOCKSUM_BIAS + 2*log2(file_len) - log2(block_len)
  * provided by Donovan Baarda which gives a probability of rsync
  * algorithm corrupting data and falling back using the whole md4
  * checksums.
@@ -500,7 +507,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 {
 	int fname_len, fname_suf_len;
 	const char *fname_suf, *fname = file->basename;
-	uint32 lowest_dist = 0x7FFFFFFF;
+	uint32 lowest_dist = 25 << 16; /* ignore a distance greater than 25 */
 	int j, lowest_j = -1;
 
 	fname_len = strlen(fname);
@@ -565,6 +572,8 @@ void check_for_finished_hlinks(int itemizing, enum logcode code)
 	}
 }
 
+static int phase = 0;
+
 /* Acts on the_file_list->file's ndx'th item, whose name is fname.  If a dir,
  * make sure it exists, and has the right permissions/timestamp info.  For
  * all other non-regular files (symlinks, etc.) we create them here.  For
@@ -575,16 +584,16 @@ void check_for_finished_hlinks(int itemizing, enum logcode code)
  * modification-time repair. */
 static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			   int itemizing, int maybe_PERMS_REPORT,
-			   enum logcode code, int f_out, int f_out_name)
+			   enum logcode code, int f_out)
 {
 	static int missing_below = -1, excluded_below = -1;
-	static char *fuzzy_dirname = NULL;
+	static char *fuzzy_dirname = "";
 	static struct file_list *fuzzy_dirlist = NULL;
 	struct file_struct *fuzzy_file = NULL;
 	int fd = -1, f_copy = -1;
-	STRUCT_STAT st, partial_st;
+	STRUCT_STAT st, real_st, partial_st;
 	struct file_struct *back_file = NULL;
-	int statret, stat_errno;
+	int statret, real_ret, stat_errno;
 	char *fnamecmp, *partialptr, *backupptr = NULL;
 	char fnamecmpbuf[MAXPATHLEN];
 	uchar fnamecmp_type;
@@ -596,7 +605,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (fuzzy_dirlist) {
 			flist_free(fuzzy_dirlist);
 			fuzzy_dirlist = NULL;
-			fuzzy_dirname = NULL;
+			fuzzy_dirname = "";
 		}
 		if (missing_below >= 0) {
 			dry_run--;
@@ -640,15 +649,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	} else {
 		if (fuzzy_basis && S_ISREG(file->mode)) {
 			char *dn = file->dirname ? file->dirname : ".";
-			/* Yes, identical dirnames are guaranteed to have
-			 * identical pointers at this point. */
-			if (fuzzy_dirname != dn) {
+			if (fuzzy_dirname != dn
+			    && strcmp(fuzzy_dirname, dn) != 0) {
 				if (fuzzy_dirlist)
 					flist_free(fuzzy_dirlist);
-				fuzzy_dirname = dn;
-				fuzzy_dirlist = get_dirlist(fuzzy_dirname, -1,
-							    1);
+				fuzzy_dirlist = get_dirlist(dn, -1, 1);
 			}
+			fuzzy_dirname = dn;
 		}
 
 		statret = link_stat(fname, &st,
@@ -681,7 +688,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		 * we need to delete it.  If it doesn't exist, then
 		 * (perhaps recursively) create it. */
 		if (statret == 0 && !S_ISDIR(st.st_mode)) {
-			delete_item(fname, st.st_mode, DEL_TERSE);
+			if (delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+				return;
 			statret = -1;
 		}
 		if (dry_run && statret != 0 && missing_below < 0) {
@@ -690,7 +698,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 		if (itemizing && f_out != -1) {
 			itemize(file, ndx, statret, &st,
-				statret ? ITEM_LOCAL_CHANGE : 0, NULL);
+				statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
 		}
 		if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
 			if (!relative_paths || errno != ENOENT
@@ -704,7 +712,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (set_perms(fname, file, statret ? NULL : &st, 0)
 		    && verbose && code && f_out != -1)
 			rprintf(code, "%s/\n", safe_fname(fname));
-		if (delete_during && f_out != -1 && csum_length != SUM_LENGTH
+		if (delete_during && f_out != -1 && !phase && dry_run < 2
 		    && (file->flags & FLAG_DEL_HERE))
 			delete_in_dir(the_file_list, fname, file);
 		return;
@@ -742,7 +750,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				if (strcmp(lnk, file->u.link) == 0) {
 					if (itemizing) {
 						itemize(file, ndx, 0, &st, 0,
-							NULL);
+							0, NULL);
 					}
 					set_perms(fname, file, &st,
 						  maybe_PERMS_REPORT);
@@ -751,12 +759,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			}
 			/* Not the right symlink (or not a symlink), so
 			 * delete it. */
-			if (S_ISLNK(st.st_mode))
-				delete_item(fname, st.st_mode, DEL_TERSE);
-			else {
-				delete_item(fname, st.st_mode, DEL_TERSE);
+			if (delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+				return;
+			if (!S_ISLNK(st.st_mode))
 				statret = -1;
-			}
 		}
 		if (do_symlink(file->u.link,fname) != 0) {
 			rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
@@ -765,7 +771,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			set_perms(fname,file,NULL,0);
 			if (itemizing) {
 				itemize(file, ndx, statret, &st,
-					ITEM_LOCAL_CHANGE, NULL);
+					ITEM_LOCAL_CHANGE, 0, NULL);
 			}
 			if (code && verbose) {
 				rprintf(code, "%s -> %s\n", safe_fname(fname),
@@ -785,7 +791,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (statret != 0 ||
 		    st.st_mode != file->mode ||
 		    st.st_rdev != file->u.rdev) {
-			delete_item(fname, st.st_mode, DEL_TERSE);
+			if (delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+				return;
 			if (!IS_DEVICE(st.st_mode))
 				statret = -1;
 			if (verbose > 2) {
@@ -800,7 +807,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				set_perms(fname,file,NULL,0);
 				if (itemizing) {
 					itemize(file, ndx, statret, &st,
-						ITEM_LOCAL_CHANGE, NULL);
+						ITEM_LOCAL_CHANGE, 0, NULL);
 				}
 				if (code && verbose) {
 					rprintf(code, "%s\n",
@@ -809,7 +816,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			}
 		} else {
 			if (itemizing)
-				itemize(file, ndx, statret, &st, 0, NULL);
+				itemize(file, ndx, statret, &st, 0, 0, NULL);
 			set_perms(fname, file, &st, maybe_PERMS_REPORT);
 		}
 		return;
@@ -840,6 +847,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	fnamecmp = fname;
 	fnamecmp_type = FNAMECMP_FNAME;
 
+	if (statret == 0 && !S_ISREG(st.st_mode)) {
+		if (delete_item(fname, st.st_mode, DEL_TERSE) != 0)
+			return;
+		statret = -1;
+		stat_errno = ENOENT;
+	}
+
 	if (statret != 0 && basis_dir[0] != NULL) {
 		int best_match = -1;
 		int match_level = 0;
@@ -860,6 +874,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 					continue;
 				best_match = i;
 				match_level = 2;
+				if (copy_dest)
+					break;
 				/* FALL THROUGH */
 			case 2:
 				if (!unchanged_attrs(file, &st))
@@ -897,19 +913,28 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				match_level = 2;
 			}
 #endif
-			if (compare_dest || (match_level && match_level < 3)) {
+			if (match_level == 2) {
+				/* Copy the file locally. */
+				if (copy_file(fnamecmpbuf, fname, file->mode) < 0) {
+					if (verbose) {
+						rsyserr(FINFO, errno,
+							"copy_file %s => %s",
+							full_fname(fnamecmpbuf),
+							safe_fname(fname));
+					}
+					match_level = 0;
+					statret = -1;
+				} else
+					set_perms(fname, file, NULL, 0);
+			} else if (compare_dest || match_level == 1) {
 				fnamecmp = fnamecmpbuf;
 				fnamecmp_type = i;
 			}
 		}
 	}
 
-	if (statret == 0 && !S_ISREG(st.st_mode)) {
-		if (delete_item(fname, st.st_mode, DEL_TERSE) != 0)
-			return;
-		statret = -1;
-		stat_errno = ENOENT;
-	}
+	real_ret = statret;
+	real_st = st;
 
 	if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
 	    && link_stat(partialptr, &partial_st, 0) == 0
@@ -928,9 +953,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
 					safe_fname(fname), safe_fname(fnamecmpbuf));
 			}
-			st.st_mode = fuzzy_file->mode;
 			st.st_size = fuzzy_file->length;
-			st.st_mtime = fuzzy_file->modtime;
 			statret = 0;
 			fnamecmp = fnamecmpbuf;
 			fnamecmp_type = FNAMECMP_FUZZY;
@@ -956,19 +979,19 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		;
 	else if (unchanged_file(fnamecmp, file, &st)) {
 		if (fnamecmp_type == FNAMECMP_FNAME) {
-			if (itemizing)
-				itemize(file, ndx, statret, &st, 0, NULL);
+			if (itemizing) {
+				itemize(file, ndx, real_ret, &real_st,
+					0, 0, NULL);
+			}
 			set_perms(fname, file, &st, maybe_PERMS_REPORT);
 			if (preserve_hard_links && file->link_u.links)
 				hard_link_cluster(file, ndx, itemizing, code);
 			return;
 		}
 		/* Only --compare-dest gets here. */
-		if (unchanged_attrs(file, &st)) {
-			itemize(file, ndx, statret, &st,
-				ITEM_NO_DEST_AND_NO_UPDATE, NULL);
-			return;
-		}
+		itemize(file, ndx, real_ret, &real_st,
+			ITEM_NO_DEST_AND_NO_UPDATE, 0, NULL);
+		return;
 	}
 
 prepare_to_open:
@@ -998,11 +1021,11 @@ prepare_to_open:
 		/* pretend the file didn't exist */
 		if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
 			return;
-		statret = -1;
+		statret = real_ret = -1;
 		goto notify_others;
 	}
 
-	if (inplace && make_backups) {
+	if (inplace && make_backups && fnamecmp_type == FNAMECMP_FNAME) {
 		if (!(backupptr = get_backup_name(fname))) {
 			close(fd);
 			return;
@@ -1044,15 +1067,11 @@ notify_others:
 		if (always_checksum)
 			iflags |= ITEM_REPORT_CHECKSUM;
 		if (fnamecmp_type != FNAMECMP_FNAME)
-			iflags |= ITEM_USING_ALT_BASIS;
-		itemize(file, -1, statret, &st, iflags, NULL);
-	}
-	if (f_out_name >= 0) {
-		write_byte(f_out_name, fnamecmp_type);
-		if (fnamecmp_type == FNAMECMP_FUZZY) {
-			write_vstring(f_out_name, fuzzy_file->basename,
-				      strlen(fuzzy_file->basename));
-		}
+			iflags |= ITEM_BASIS_TYPE_FOLLOWS;
+		if (fnamecmp_type == FNAMECMP_FUZZY)
+			iflags |= ITEM_XNAME_FOLLOWS;
+		itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type,
+			fuzzy_file ? fuzzy_file->basename : NULL);
 	}
 
 	if (dry_run) {
@@ -1084,11 +1103,9 @@ notify_others:
 }
 
 
-void generate_files(int f_out, struct file_list *flist, char *local_name,
-		    int f_out_name)
+void generate_files(int f_out, struct file_list *flist, char *local_name)
 {
 	int i, lull_mod;
-	int phase = 0;
 	char fbuf[MAXPATHLEN];
 	int itemizing, maybe_PERMS_REPORT;
 	enum logcode code;
@@ -1140,31 +1157,35 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 
 	for (i = 0; i < flist->count; i++) {
 		struct file_struct *file = flist->files[i];
-		struct file_struct copy;
 
 		if (!file->basename)
 			continue;
 
+		recv_generator(local_name ? local_name : f_name_to(file, fbuf),
+			       file, i, itemizing, maybe_PERMS_REPORT, code,
+			       f_out);
+
 		/* We need to ensure that any dirs we create have writeable
 		 * permissions during the time we are putting files within
 		 * them.  This is then fixed after the transfer is done. */
 		if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)) {
-			copy = *file;
-			copy.mode |= S_IWUSR; /* user write */
-			file = &copy;
+			int mode = file->mode | S_IWUSR; /* user write */
+			char *fname = local_name ? local_name : fbuf;
+			if (do_chmod(fname, mode & CHMOD_BITS) < 0) {
+				rsyserr(FERROR, errno,
+					"failed to modify permissions on %s",
+					full_fname(fname));
+			}
 			need_retouch_dir_perms = 1;
 		}
 
-		recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-			       file, i, itemizing, maybe_PERMS_REPORT, code,
-			       f_out, f_out_name);
 		if (preserve_hard_links)
 			check_for_finished_hlinks(itemizing, code);
 
 		if (allowed_lull && !(i % lull_mod))
 			maybe_send_keepalive();
 	}
-	recv_generator(NULL, NULL, 0, 0, 0, code, -1, -1);
+	recv_generator(NULL, NULL, 0, 0, 0, code, -1);
 	if (delete_during)
 		delete_in_dir(NULL, NULL, NULL);
 
@@ -1190,7 +1211,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 		struct file_struct *file = flist->files[i];
 		recv_generator(local_name ? local_name : f_name_to(file, fbuf),
 			       file, i, itemizing, maybe_PERMS_REPORT, code,
-			       f_out, f_out_name);
+			       f_out);
 	}
 
 	phase++;
@@ -1202,9 +1223,18 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 
 	write_int(f_out, -1);
 
-	/* Read post-redo-phase MSG_DONE and any prior messages. */
+	/* Read MSG_DONE for the redo phase (and any prior messages). */
 	get_redo_num(itemizing, code);
 
+	if (protocol_version >= 29) {
+		phase++;
+		if (verbose > 2)
+			rprintf(FINFO, "generate_files phase=%d\n", phase);
+		write_int(f_out, -1);
+		/* Read MSG_DONE for delay-update phase & prior messages. */
+		get_redo_num(itemizing, code);
+	}
+
 	if (delete_after && !local_name && flist->count > 0)
 		do_delete_pass(flist);
 
@@ -1220,14 +1250,20 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 				continue;
 			if (!need_retouch_dir_times && file->mode & S_IWUSR)
 				continue;
-			recv_generator(local_name ? local_name : f_name(file),
-				       file, i, itemizing, maybe_PERMS_REPORT,
-				       code, -1, -1);
+			recv_generator(f_name(file), file, i, itemizing,
+				       maybe_PERMS_REPORT, code, -1);
 			if (allowed_lull && !(j++ % lull_mod))
 				maybe_send_keepalive();
 		}
 	}
-	recv_generator(NULL, NULL, 0, 0, 0, code, -1, -1);
+	recv_generator(NULL, NULL, 0, 0, 0, code, -1);
+
+	if (max_delete > 0 && deletion_count > max_delete) {
+		rprintf(FINFO,
+			"Deletions stopped due to --max-delete limit (%d skipped)\n",
+			deletion_count - max_delete);
+		io_error |= IOERR_DEL_LIMIT;
+	}
 
 	if (verbose > 2)
 		rprintf(FINFO,"generate_files finished\n");