X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/065a6052705d6a1f5405d863d1680b2201485908..34bde8d54af97d339f3cb8d8343566bcdb2a1e5b:/generator.c

diff --git a/generator.c b/generator.c
index 8a73420d..c51a98bf 100644
--- a/generator.c
+++ b/generator.c
@@ -36,6 +36,8 @@ 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;
@@ -154,7 +156,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) {
@@ -199,7 +200,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;
@@ -209,7 +210,7 @@ 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;
 
@@ -221,6 +222,9 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out)
 		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) {
@@ -252,10 +256,11 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out)
 static void recv_generator(char *fname, struct file_struct *file, int i,
 			   int f_out)
 {
-	int fd;
-	STRUCT_STAT st;
+	int fd, f_copy;
+	STRUCT_STAT st, partial_st;
+	struct file_struct *back_file;
 	int statret, stat_errno;
-	char *fnamecmp;
+	char *fnamecmp, *partialptr, *backupptr;
 	char fnamecmpbuf[MAXPATHLEN];
 
 	if (list_only)
@@ -274,8 +279,14 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		return;
 	}
 
-	statret = link_stat(fname, &st, keep_dirlinks && S_ISDIR(file->mode));
-	stat_errno = errno;
+	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 && stat_errno == ENOENT) {
 		/* we only want to update existing files */
@@ -374,7 +385,6 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		return;
 	}
 
-#ifdef HAVE_MKNOD
 	if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
 		if (statret != 0 ||
 		    st.st_mode != file->mode ||
@@ -400,7 +410,6 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		}
 		return;
 	}
-#endif
 
 	if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER))
 		return;
@@ -443,6 +452,14 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		stat_errno = ENOENT;
 	}
 
+	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;
+
 	if (statret == -1) {
 		if (preserve_hard_links && hard_link_check(file, HL_SKIP))
 			return;
@@ -477,6 +494,7 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		return;
 	}
 
+prepare_to_open:
 	if (dry_run || read_batch) {
 		write_int(f_out,i);
 		return;
@@ -488,14 +506,9 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		return;
 	}
 
-	if (partial_dir) {
-		STRUCT_STAT st2;
-		char *partialptr = partial_dir_fname(fname);
-		if (partialptr && link_stat(partialptr, &st2, 0) == 0
-		    && S_ISREG(st2.st_mode)) {
-			st = st2;
-			fnamecmp = partialptr;
-		}
+	if (partialptr) {
+		st = partial_st;
+		fnamecmp = partialptr;
 	}
 
 	/* open the file */
@@ -504,6 +517,7 @@ 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;
@@ -512,6 +526,36 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		return;
 	}
 
+	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;
+		}
+	} else {
+		backupptr = NULL;
+		back_file = NULL;
+		f_copy = -1;
+	}
+
 	if (verbose > 3) {
 		rprintf(FINFO, "gen mapped %s of size %.0f\n",
 			safe_fname(fnamecmp), (double)st.st_size);
@@ -521,7 +565,15 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		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);
+	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);
 }