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

diff --git a/generator.c b/generator.c
index 728bcb77..ce93b5ad 100644
--- a/generator.c
+++ b/generator.c
@@ -36,13 +36,18 @@ extern int preserve_uid;
 extern int preserve_gid;
 extern int update_only;
 extern int opt_ignore_existing;
+extern int inplace;
+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 *compare_dest;
+extern char *partial_dir;
+extern char *basis_dir[];
+extern int copy_dest;
 extern int link_dest;
 extern int whole_file;
 extern int local_server;
@@ -51,43 +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 (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];
-		char fnamecmpdest[MAXPATHLEN];
-
-		if (compare_dest != NULL) {
-			if (access(fname, 0) != 0) {
-				pathjoin(fnamecmpdest, sizeof fnamecmpdest,
-					 compare_dest, fname);
-				fname = fnamecmpdest;
-			}
-		}
-		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;
 	}
@@ -136,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 {
@@ -162,7 +157,6 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
 			c >>= 1;
 		} while (c >= 8);	/* round to multiple of 8 */
 		blength = MAX(blength, BLOCK_SIZE);
-		blength = MIN(blength, MAX_MAP_SIZE);
 	}
 
 	if (protocol_version < 27) {
@@ -170,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);
 	}
@@ -195,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);
 	}
 }
@@ -207,7 +195,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
  *
  * Generate approximately one checksum every block_len bytes.
  */
-static void generate_and_send_sums(int fd, OFF_T len, int f_out)
+static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
 {
 	size_t i;
 	struct map_struct *mapbuf;
@@ -217,24 +205,27 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out)
 	sum_sizes_sqroot(&sum, len);
 
 	if (len > 0)
-		mapbuf = map_file(fd, len, sum.blength);
+		mapbuf = map_file(fd, len, MAX_MAP_SIZE, sum.blength);
 	else
 		mapbuf = NULL;
 
 	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];
 
+		if (f_copy >= 0)
+			full_write(f_copy, map, n1);
+
 		get_checksum2(map, n1, sum2);
 
 		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);
@@ -258,42 +249,52 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out)
  * out.  It might be wrong.
  */
 static void recv_generator(char *fname, struct file_struct *file, int i,
-			   int f_out)
+			   int f_out, int f_out_name)
 {
-	int fd;
-	STRUCT_STAT st;
-	int statret;
-	char *fnamecmp;
+	int fd = -1, f_copy = -1;
+	STRUCT_STAT st, partial_st;
+	struct file_struct *back_file = NULL;
+	int statret, stat_errno;
+	char *fnamecmp, *partialptr, *backupptr = NULL;
 	char fnamecmpbuf[MAXPATHLEN];
+	uchar fnamecmp_type;
 
 	if (list_only)
 		return;
 
 	if (verbose > 2)
-		rprintf(FINFO,"recv_generator(%s,%d)\n",fname,i);
+		rprintf(FINFO, "recv_generator(%s,%d)\n", safe_fname(fname), i);
 
 	if (server_exclude_list.head
 	    && check_exclude(&server_exclude_list, fname,
 			     S_ISDIR(file->mode)) < 0) {
 		if (verbose) {
 			rprintf(FINFO, "skipping server-excluded file \"%s\"\n",
-				fname);
+				safe_fname(fname));
 		}
 		return;
 	}
 
-	statret = link_stat(fname, &st, keep_dirlinks && S_ISDIR(file->mode));
+	if (dry_run > 1) {
+		statret = -1;
+		stat_errno = ENOENT;
+	} else {
+		statret = link_stat(fname, &st,
+				    keep_dirlinks && S_ISDIR(file->mode));
+		stat_errno = errno;
+	}
 
-	if (only_existing && statret == -1 && errno == ENOENT) {
+	if (only_existing && statret == -1 && stat_errno == ENOENT) {
 		/* we only want to update existing files */
-		if (verbose > 1)
-			rprintf(FINFO, "not creating new file \"%s\"\n", fname);
+		if (verbose > 1) {
+			rprintf(FINFO, "not creating new file \"%s\"\n",
+				safe_fname(fname));
+		}
 		return;
 	}
 
-	if (statret == 0 &&
-	    !preserve_perms &&
-	    (S_ISDIR(st.st_mode) == S_ISDIR(file->mode))) {
+	if (statret == 0 && !preserve_perms
+	    && S_ISDIR(st.st_mode) == S_ISDIR(file->mode)) {
 		/* if the file exists already and we aren't perserving
 		 * permissions then act as though the remote end sent
 		 * us the file permissions we already have */
@@ -332,7 +333,11 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		 * and modification-time repair. */
 		if (set_perms(fname, file, statret ? NULL : &st, 0)
 		    && verbose && f_out != -1)
-			rprintf(FINFO,"%s/\n",fname);
+			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;
 	}
 
@@ -368,18 +373,18 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		}
 		if (do_symlink(file->u.link,fname) != 0) {
 			rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
-				full_fname(fname), file->u.link);
+				full_fname(fname), safe_fname(file->u.link));
 		} else {
 			set_perms(fname,file,NULL,0);
 			if (verbose) {
-				rprintf(FINFO,"%s -> %s\n", fname,file->u.link);
+				rprintf(FINFO, "%s -> %s\n", safe_fname(fname),
+					safe_fname(file->u.link));
 			}
 		}
 #endif
 		return;
 	}
 
-#ifdef HAVE_MKNOD
 	if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
 		if (statret != 0 ||
 		    st.st_mode != file->mode ||
@@ -387,114 +392,153 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 			delete_file(fname);
 			if (verbose > 2) {
 				rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
-					fname,(int)file->mode,(int)file->u.rdev);
+					safe_fname(fname),
+					(int)file->mode, (int)file->u.rdev);
 			}
 			if (do_mknod(fname,file->mode,file->u.rdev) != 0) {
 				rsyserr(FERROR, errno, "mknod %s failed",
 					full_fname(fname));
 			} else {
 				set_perms(fname,file,NULL,0);
-				if (verbose)
-					rprintf(FINFO,"%s\n",fname);
+				if (verbose) {
+					rprintf(FINFO, "%s\n",
+						safe_fname(fname));
+				}
 			}
 		} else {
 			set_perms(fname, file, &st, PERMS_REPORT);
 		}
 		return;
 	}
-#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);
+		rprintf(FINFO, "skipping non-regular file \"%s\"\n",
+			safe_fname(fname));
 		return;
 	}
 
 	fnamecmp = fname;
+	fnamecmp_type = 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, 0);
-		if (!S_ISREG(st.st_mode))
-			statret = -1;
-		if (statret == -1)
-			errno = saveerrno;
+	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
-		else if (link_dest && !dry_run) {
-			if (do_link(fnamecmpbuf, fname) != 0) {
-				if (verbose > 0) {
-					rsyserr(FINFO, errno, "link %s => %s",
-						fnamecmpbuf, fname);
+			if (link_dest && match_level == 3 && !dry_run) {
+				if (do_link(fnamecmpbuf, fname) < 0) {
+					if (verbose) {
+						rsyserr(FINFO, errno,
+							"link %s => %s",
+							fnamecmpbuf,
+							safe_fname(fname));
+					}
+					fnamecmp = fnamecmpbuf;
+					fnamecmp_type = FNAMECMP_BASIS_DIR + i;
 				}
+			} else
+#endif
+			{
+				fnamecmp = fnamecmpbuf;
+				fnamecmp_type = FNAMECMP_BASIS_DIR + i;
 			}
-			fnamecmp = fnamecmpbuf;
 		}
-#endif
-		else
-			fnamecmp = fnamecmpbuf;
 	}
 
-	if (statret == -1) {
-		if (preserve_hard_links && hard_link_check(file, HL_SKIP))
+	if (statret == 0 && !S_ISREG(st.st_mode)) {
+		if (delete_file(fname) != 0)
 			return;
-		if (errno == ENOENT) {
-			write_int(f_out,i);
-			if (!dry_run && !read_batch)
-				write_sum_head(f_out, NULL);
-		} else if (verbose > 1) {
-			rsyserr(FERROR, errno,
-				"recv_generator: failed to open %s",
-				full_fname(fname));
-		}
-		return;
+		statret = -1;
+		stat_errno = ENOENT;
 	}
 
-	if (!S_ISREG(st.st_mode)) {
-		if (delete_file(fname) != 0) {
-			return;
-		}
+	if (partial_dir && (partialptr = partial_dir_fname(fname))
+	    && link_stat(partialptr, &partial_st, 0) == 0
+	    && S_ISREG(partial_st.st_mode)) {
+		if (statret == -1)
+			goto prepare_to_open;
+	} else
+		partialptr = NULL;
 
-		/* now pretend the file didn't exist */
+	if (statret == -1) {
 		if (preserve_hard_links && hard_link_check(file, HL_SKIP))
 			return;
-		write_int(f_out,i);
-		if (!dry_run && !read_batch)
-			write_sum_head(f_out, NULL);
+		if (stat_errno == ENOENT)
+			goto notify_others;
+		if (verbose > 1) {
+			rsyserr(FERROR, stat_errno,
+				"recv_generator: failed to stat %s",
+				full_fname(fname));
+		}
 		return;
 	}
 
-	if (opt_ignore_existing && fnamecmp == fname) {
+	if (opt_ignore_existing && fnamecmp_type == FNAMECMP_FNAME) {
 		if (verbose > 1)
-			rprintf(FINFO,"%s exists\n",fname);
+			rprintf(FINFO, "%s exists\n", safe_fname(fname));
 		return;
 	}
 
-	if (update_only && fnamecmp == fname
+	if (update_only && fnamecmp_type == FNAMECMP_FNAME
 	    && cmp_modtime(st.st_mtime, file->modtime) > 0) {
 		if (verbose > 1)
-			rprintf(FINFO,"%s is newer\n",fname);
+			rprintf(FINFO, "%s is newer\n", safe_fname(fname));
 		return;
 	}
 
-	if (skip_file(fname, file, &st)) {
-		if (fnamecmp == fname)
+	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;
 	}
 
-	if (dry_run || read_batch) {
-		write_int(f_out,i);
-		return;
+prepare_to_open:
+	if (dry_run || whole_file > 0) {
+		statret = -1;
+		goto notify_others;
 	}
+	if (read_batch)
+		goto notify_others;
 
-	if (whole_file > 0) {
-		write_int(f_out,i);
-		write_sum_head(f_out, NULL);
-		return;
+	if (partialptr) {
+		st = partial_st;
+		fnamecmp = partialptr;
+		fnamecmp_type = FNAMECMP_PARTIAL_DIR;
 	}
 
 	/* open the file */
@@ -503,30 +547,78 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 	if (fd == -1) {
 		rsyserr(FERROR, errno, "failed to open %s, continuing",
 			full_fname(fnamecmp));
+	    pretend_missing:
 		/* pretend the file didn't exist */
 		if (preserve_hard_links && hard_link_check(file, HL_SKIP))
 			return;
-		write_int(f_out,i);
-		write_sum_head(f_out, NULL);
-		return;
+		statret = -1;
+		goto notify_others;
+	}
+
+	if (inplace && make_backups) {
+		if (!(backupptr = get_backup_name(fname))) {
+			close(fd);
+			return;
+		}
+		if (!(back_file = make_file(fname, NULL, NO_EXCLUDES))) {
+			close(fd);
+			goto pretend_missing;
+		}
+		if (robust_unlink(backupptr) && errno != ENOENT) {
+			rsyserr(FERROR, errno, "unlink %s",
+				full_fname(backupptr));
+			free(back_file);
+			close(fd);
+			return;
+		}
+		if ((f_copy = do_open(backupptr,
+		    O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
+			rsyserr(FERROR, errno, "open %s",
+				full_fname(backupptr));
+			free(back_file);
+			close(fd);
+			return;
+		}
+		fnamecmp_type = FNAMECMP_BACKUP;
 	}
 
 	if (verbose > 3) {
-		rprintf(FINFO,"gen mapped %s of size %.0f\n", fnamecmp,
-			(double)st.st_size);
+		rprintf(FINFO, "gen mapped %s of size %.0f\n",
+			safe_fname(fnamecmp), (double)st.st_size);
 	}
 
 	if (verbose > 2)
 		rprintf(FINFO, "generating and sending sums for %d\n", i);
 
-	write_int(f_out,i);
-	generate_and_send_sums(fd, st.st_size, f_out);
+notify_others:
+	write_int(f_out, i);
+	if (f_out_name >= 0)
+		write_byte(f_out_name, fnamecmp_type);
 
-	close(fd);
+	if (dry_run || read_batch)
+		return;
+
+	if (statret == 0) {
+		generate_and_send_sums(fd, st.st_size, f_out, f_copy);
+
+		if (f_copy >= 0) {
+			close(f_copy);
+			set_perms(backupptr, back_file, NULL, 0);
+			if (verbose > 1) {
+				rprintf(FINFO, "backed up %s to %s\n",
+					fname, backupptr);
+			}
+			free(back_file);
+		}
+
+		close(fd);
+	} else
+		write_sum_head(f_out, NULL);
 }
 
 
-void generate_files(int f_out, struct file_list *flist, char *local_name)
+void generate_files(int f_out, struct file_list *flist, char *local_name,
+		    int f_out_name)
 {
 	int i;
 	int phase = 0;
@@ -567,7 +659,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);
+			       file, i, f_out, f_out_name);
 	}
 
 	phase++;
@@ -584,7 +676,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);
+			       file, i, f_out, f_out_name);
 	}
 
 	phase++;
@@ -593,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();
 
@@ -603,7 +698,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);
+			       file, i, -1, -1);
 	}
 
 	if (verbose > 2)