X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/41cfde6be388364f9bf7dfa9a532625b1f660df7..aaca3daa27dfea906c173908aad06fee8e243859:/generator.c

diff --git a/generator.c b/generator.c
index 6d62e06f..6c51a182 100644
--- a/generator.c
+++ b/generator.c
@@ -34,6 +34,7 @@ extern int preserve_hard_links;
 extern int preserve_perms;
 extern int preserve_uid;
 extern int preserve_gid;
+extern int delete_during;
 extern int update_only;
 extern int opt_ignore_existing;
 extern int inplace;
@@ -41,11 +42,13 @@ extern int make_backups;
 extern int csum_length;
 extern int ignore_times;
 extern int size_only;
+extern OFF_T max_size;
 extern int io_timeout;
 extern int protocol_version;
 extern int always_checksum;
 extern char *partial_dir;
-extern char *compare_dest;
+extern char *basis_dir[];
+extern int compare_dest;
 extern int link_dest;
 extern int whole_file;
 extern int local_server;
@@ -54,34 +57,36 @@ extern int read_batch;
 extern int only_existing;
 extern int orig_umask;
 extern int safe_symlinks;
-extern unsigned int block_size;
+extern long block_size; /* "long" because popt can't set an int32. */
 
 extern struct exclude_list_struct server_exclude_list;
 
-
-/* choose whether to skip a particular file */
-static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
+static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
 {
-	if (st->st_size != file->length)
+	if (preserve_perms
+	 && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
 		return 0;
-	if (link_dest) {
-		if (preserve_perms
-		    && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
-			return 0;
 
-		if (am_root && preserve_uid && st->st_uid != file->uid)
-			return 0;
+	if (am_root && preserve_uid && st->st_uid != file->uid)
+		return 0;
 
-		if (preserve_gid && file->gid != GID_NONE
-		    && st->st_gid != file->gid)
-			return 0;
-	}
+	if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid)
+		return 0;
+
+	return 1;
+}
+
+/* Perform our quick-check heuristic for determining if a file is unchanged. */
+static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
+{
+	if (st->st_size != file->length)
+		return 0;
 
 	/* if always checksum is set then we use the checksum instead
 	   of the file time to determine whether to sync */
 	if (always_checksum && S_ISREG(st->st_mode)) {
 		char sum[MD4_SUM_LENGTH];
-		file_checksum(fname,sum,st->st_size);
+		file_checksum(fn, sum, st->st_size);
 		return memcmp(sum, file->u.sum, protocol_version < 21 ? 2
 							: MD4_SUM_LENGTH) == 0;
 	}
@@ -96,23 +101,6 @@ static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
 }
 
 
-/*
- * NULL sum_struct means we have no checksums
- */
-void write_sum_head(int f, struct sum_struct *sum)
-{
-	static struct sum_struct null_sum;
-
-	if (sum == NULL)
-		sum = &null_sum;
-
-	write_int(f, sum->count);
-	write_int(f, sum->blength);
-	if (protocol_version >= 27)
-		write_int(f, sum->s2length);
-	write_int(f, sum->remainder);
-}
-
 /*
  * set (initialize) the size entries in the per-file sum_struct
  * calculating dynamic block and checksum sizes.
@@ -130,32 +118,32 @@ void write_sum_head(int f, struct sum_struct *sum)
  *
  * This might be made one of several selectable heuristics.
  */
-
-static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
+static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
 {
-	unsigned int blength;
+	int32 blength;
 	int s2length;
-	uint32 c;
-	uint64 l;
 
-	if (block_size) {
+	if (block_size)
 		blength = block_size;
-	} else if (len <= BLOCK_SIZE * BLOCK_SIZE) {
+	else if (len <= BLOCK_SIZE * BLOCK_SIZE)
 		blength = BLOCK_SIZE;
-	} else {
-		l = len;
-		c = 1;
-		while (l >>= 2) {
-			c <<= 1;
+	else {
+		int32 c;
+		int64 l;
+		int cnt;
+		for (c = 1, l = len, cnt = 0; l >>= 2; c <<= 1, cnt++) {}
+		if (cnt >= 31 || c >= MAX_BLOCK_SIZE)
+			blength = MAX_BLOCK_SIZE;
+		else {
+		    blength = 0;
+		    do {
+			    blength |= c;
+			    if (len < (int64)blength * blength)
+				    blength &= ~c;
+			    c >>= 1;
+		    } while (c >= 8);	/* round to multiple of 8 */
+		    blength = MAX(blength, BLOCK_SIZE);
 		}
-		blength = 0;
-		do {
-			blength |= c;
-			if (len < (uint64)blength * blength)
-				blength &= ~c;
-			c >>= 1;
-		} while (c >= 8);	/* round to multiple of 8 */
-		blength = MAX(blength, BLOCK_SIZE);
 	}
 
 	if (protocol_version < 27) {
@@ -163,20 +151,13 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
 	} else if (csum_length == SUM_LENGTH) {
 		s2length = SUM_LENGTH;
 	} else {
+		int32 c;
+		int64 l;
 		int b = BLOCKSUM_BIAS;
-		l = len;
-		while (l >>= 1) {
-			b += 2;
-		}
-		c = blength;
-		while (c >>= 1 && b) {
-			b--;
-		}
-		s2length = (b + 1 - 32 + 7) / 8; /* add a bit,
-						  * subtract rollsum,
-						  * round up
-						  *    --optimize in compiler--
-						  */
+		for (l = len; l >>= 1; b += 2) {}
+		for (c = blength; c >>= 1 && b; b--) {}
+		/* add a bit, subtract rollsum, round up. */
+		s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */
 		s2length = MAX(s2length, csum_length);
 		s2length = MIN(s2length, SUM_LENGTH);
 	}
@@ -188,8 +169,9 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
 	sum->remainder	= (len % blength);
 
 	if (sum->count && verbose > 2) {
-		rprintf(FINFO, "count=%.0f rem=%u blength=%u s2length=%d flength=%.0f\n",
-			(double)sum->count, sum->remainder, sum->blength,
+		rprintf(FINFO,
+			"count=%.0f rem=%ld blength=%ld s2length=%d flength=%.0f\n",
+			(double)sum->count, (long)sum->remainder, (long)sum->blength,
 			sum->s2length, (double)sum->flength);
 	}
 }
@@ -217,7 +199,7 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
 	write_sum_head(f_out, &sum);
 
 	for (i = 0; i < sum.count; i++) {
-		unsigned int n1 = MIN(len, sum.blength);
+		int32 n1 = (int32)MIN(len, (OFF_T)sum.blength);
 		char *map = map_ptr(mapbuf, offset, n1);
 		uint32 sum1 = get_checksum1(map, n1);
 		char sum2[SUM_LENGTH];
@@ -229,8 +211,8 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
 
 		if (verbose > 3) {
 			rprintf(FINFO,
-				"chunk[%.0f] offset=%.0f len=%u sum1=%08lx\n",
-				(double)i, (double)offset, n1,
+				"chunk[%.0f] offset=%.0f len=%ld sum1=%08lx\n",
+				(double)i, (double)offset, (long)n1,
 				(unsigned long)sum1);
 		}
 		write_int(f_out, sum1);
@@ -244,7 +226,6 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
 }
 
 
-
 /*
  * Acts on file number @p i from @p flist, whose name is @p fname.
  *
@@ -253,7 +234,8 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
  * @note This comment was added later by mbp who was trying to work it
  * out.  It might be wrong.
  */
-static void recv_generator(char *fname, struct file_struct *file, int i,
+static void recv_generator(char *fname, struct file_list *flist,
+			   struct file_struct *file, int i,
 			   int f_out, int f_out_name)
 {
 	int fd = -1, f_copy = -1;
@@ -312,23 +294,15 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		 * to prepare appropriately.  If there is already a
 		 * file of that name and it is *not* a directory, then
 		 * we need to delete it.  If it doesn't exist, then
-		 * recursively create it. */
-
-		if (dry_run)
-			return; /* TODO: causes inaccuracies -- fix */
+		 * (perhaps recursively) create it. */
 		if (statret == 0 && !S_ISDIR(st.st_mode)) {
-			if (robust_unlink(fname) != 0) {
-				rsyserr(FERROR, errno,
-					"recv_generator: unlink %s to make room for directory",
-					full_fname(fname));
-				return;
-			}
+			delete_file(fname, DEL_TERSE);
 			statret = -1;
 		}
 		if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
-			if (!(relative_paths && errno == ENOENT
-			    && create_directory_path(fname, orig_umask) == 0
-			    && do_mkdir(fname, file->mode) == 0)) {
+			if (!relative_paths || errno != ENOENT
+			    || create_directory_path(fname, orig_umask) < 0
+			    || do_mkdir(fname, file->mode) < 0) {
 				rsyserr(FERROR, errno,
 					"recv_generator: mkdir %s failed",
 					full_fname(fname));
@@ -339,14 +313,18 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		if (set_perms(fname, file, statret ? NULL : &st, 0)
 		    && verbose && f_out != -1)
 			rprintf(FINFO, "%s/\n", safe_fname(fname));
+		if (delete_during && f_out != -1
+		    && (file->flags & FLAG_DEL_START))
+			delete_in_dir(flist, fname);
+		return;
+	} else if (max_size && file->length > max_size) {
+		if (verbose > 1)
+			rprintf(FINFO, "%s is over max-size\n", fname);
 		return;
 	}
 
 	if (preserve_links && S_ISLNK(file->mode)) {
 #if SUPPORT_LINKS
-		char lnk[MAXPATHLEN];
-		int l;
-
 		if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
 			if (verbose) {
 				rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n",
@@ -355,22 +333,25 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 			return;
 		}
 		if (statret == 0) {
-			l = readlink(fname,lnk,MAXPATHLEN-1);
-			if (l > 0) {
-				lnk[l] = 0;
+			int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
+			char lnk[MAXPATHLEN];
+			int len;
+
+			if (!dflag
+			    && (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) {
+				lnk[len] = 0;
 				/* A link already pointing to the
 				 * right place -- no further action
 				 * required. */
-				if (strcmp(lnk,file->u.link) == 0) {
+				if (strcmp(lnk, file->u.link) == 0) {
 					set_perms(fname, file, &st,
 						  PERMS_REPORT);
 					return;
 				}
 			}
-			/* Not a symlink, so delete whatever's
-			 * already there and put a new symlink
-			 * in place. */
-			delete_file(fname);
+			/* Not the right symlink (or not a symlink), so
+			 * delete it. */
+			delete_file(fname, dflag | DEL_TERSE);
 		}
 		if (do_symlink(file->u.link,fname) != 0) {
 			rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
@@ -390,7 +371,8 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		if (statret != 0 ||
 		    st.st_mode != file->mode ||
 		    st.st_rdev != file->u.rdev) {
-			delete_file(fname);
+			int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
+			delete_file(fname, dflag | DEL_TERSE);
 			if (verbose > 2) {
 				rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
 					safe_fname(fname),
@@ -424,13 +406,42 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 	fnamecmp = fname;
 	fnamecmp_type = FNAMECMP_FNAME;
 
-	if (statret == -1 && compare_dest != NULL) {
-		/* try the file at compare_dest instead */
-		pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, compare_dest, fname);
-		if (link_stat(fnamecmpbuf, &st, 0) == 0
-		    && S_ISREG(st.st_mode)) {
+	if (statret == -1 && basis_dir[0] != NULL) {
+		int fallback_match = -1;
+		int match_level = 0;
+		int i = 0;
+		do {
+			pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+				 basis_dir[i], fname);
+			if (link_stat(fnamecmpbuf, &st, 0) == 0
+			    && S_ISREG(st.st_mode)) {
+				statret = 0;
+				if (link_dest) {
+					if (!match_level) {
+						fallback_match = i;
+						match_level = 1;
+					} else if (match_level == 2
+					    && !unchanged_attrs(file, &st))
+						continue;
+					if (!unchanged_file(fnamecmpbuf, file, &st))
+						continue;
+					fallback_match = i;
+					match_level = 2;
+					if (!unchanged_attrs(file, &st))
+						continue;
+				}
+				match_level = 3;
+				break;
+			}
+		} while (basis_dir[++i] != NULL);
+		if (statret == 0) {
+			if (match_level < 3) {
+				i = fallback_match;
+				pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+					 basis_dir[i], fname);
+			}
 #if HAVE_LINK
-			if (link_dest && !dry_run) {
+			if (link_dest && match_level == 3 && !dry_run) {
 				if (do_link(fnamecmpbuf, fname) < 0) {
 					if (verbose) {
 						rsyserr(FINFO, errno,
@@ -439,26 +450,26 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 							safe_fname(fname));
 					}
 					fnamecmp = fnamecmpbuf;
-					fnamecmp_type = FNAMECMP_CMPDEST;
+					fnamecmp_type = i;
 				}
 			} else
 #endif
 			{
 				fnamecmp = fnamecmpbuf;
-				fnamecmp_type = FNAMECMP_CMPDEST;
+				fnamecmp_type = i;
 			}
-			statret = 0;
 		}
 	}
 
 	if (statret == 0 && !S_ISREG(st.st_mode)) {
-		if (delete_file(fname) != 0)
+		int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
+		if (delete_file(fname, dflag | DEL_TERSE) != 0)
 			return;
 		statret = -1;
 		stat_errno = ENOENT;
 	}
 
-	if (partial_dir && (partialptr = partial_dir_fname(fname))
+	if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
 	    && link_stat(partialptr, &partial_st, 0) == 0
 	    && S_ISREG(partial_st.st_mode)) {
 		if (statret == -1)
@@ -492,13 +503,22 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		return;
 	}
 
-	if (skip_file(fnamecmp, file, &st)) {
+	if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
+		;
+	else if (unchanged_file(fnamecmp, file, &st)) {
 		if (fnamecmp_type == FNAMECMP_FNAME)
 			set_perms(fname, file, &st, PERMS_REPORT);
 		return;
 	}
 
 prepare_to_open:
+	if (partialptr) {
+		st = partial_st;
+		fnamecmp = partialptr;
+		fnamecmp_type = FNAMECMP_PARTIAL_DIR;
+		statret = 0;
+	}
+
 	if (dry_run || whole_file > 0) {
 		statret = -1;
 		goto notify_others;
@@ -506,12 +526,6 @@ prepare_to_open:
 	if (read_batch)
 		goto notify_others;
 
-	if (partialptr) {
-		st = partial_st;
-		fnamecmp = partialptr;
-		fnamecmp_type = FNAMECMP_PARTIAL_DIR;
-	}
-
 	/* open the file */
 	fd = do_open(fnamecmp, O_RDONLY, 0);
 
@@ -563,6 +577,8 @@ prepare_to_open:
 
 notify_others:
 	write_int(f_out, i);
+	if (protocol_version >= 29 && inplace && !read_batch)
+		write_byte(f_out, fnamecmp_type);
 	if (f_out_name >= 0)
 		write_byte(f_out_name, fnamecmp_type);
 
@@ -630,7 +646,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 		}
 
 		recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-			       file, i, f_out, f_out_name);
+			       flist, file, i, f_out, f_out_name);
 	}
 
 	phase++;
@@ -647,7 +663,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 	while ((i = get_redo_num()) != -1) {
 		struct file_struct *file = flist->files[i];
 		recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-			       file, i, f_out, f_out_name);
+			       flist, file, i, f_out, f_out_name);
 	}
 
 	phase++;
@@ -656,6 +672,9 @@ 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. */
+	get_redo_num();
+
 	if (preserve_hard_links)
 		do_hard_links();
 
@@ -666,7 +685,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 		if (!file->basename || !S_ISDIR(file->mode))
 			continue;
 		recv_generator(local_name ? local_name : f_name(file),
-			       file, i, -1, -1);
+			       flist, file, i, -1, -1);
 	}
 
 	if (verbose > 2)