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

diff --git a/generator.c b/generator.c
index 6d62e06f..ce93b5ad 100644
--- a/generator.c
+++ b/generator.c
@@ -41,11 +41,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 copy_dest;
 extern int link_dest;
 extern int whole_file;
 extern int local_server;
@@ -54,34 +56,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 (am_root && preserve_uid && st->st_uid != file->uid)
 		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 (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;
 	}
@@ -130,23 +134,20 @@ 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)
 {
-	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;
+		uint64 l;
+		for (c = 1, l = len; l >>= 2; c <<= 1) {
+		    assert(c > 0);
 		}
 		blength = 0;
 		do {
@@ -163,20 +164,13 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
 	} else if (csum_length == SUM_LENGTH) {
 		s2length = SUM_LENGTH;
 	} else {
+		int32 c;
+		uint64 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 +182,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 +212,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 +224,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);
@@ -340,6 +335,10 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		    && verbose && f_out != -1)
 			rprintf(FINFO, "%s/\n", safe_fname(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)) {
@@ -424,13 +423,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,15 +467,14 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 							safe_fname(fname));
 					}
 					fnamecmp = fnamecmpbuf;
-					fnamecmp_type = FNAMECMP_CMPDEST;
+					fnamecmp_type = FNAMECMP_BASIS_DIR + i;
 				}
 			} else
 #endif
 			{
 				fnamecmp = fnamecmpbuf;
-				fnamecmp_type = FNAMECMP_CMPDEST;
+				fnamecmp_type = FNAMECMP_BASIS_DIR + i;
 			}
-			statret = 0;
 		}
 	}
 
@@ -492,7 +519,9 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		return;
 	}
 
-	if (skip_file(fnamecmp, file, &st)) {
+	if ((link_dest || copy_dest) && fnamecmp_type != FNAMECMP_FNAME)
+		;
+	else if (unchanged_file(fnamecmp, file, &st)) {
 		if (fnamecmp_type == FNAMECMP_FNAME)
 			set_perms(fname, file, &st, PERMS_REPORT);
 		return;
@@ -656,6 +685,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();