X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9774cc334494e12bd35197e7e1ab9fd6b0ef3023..a7260c403733b10e3d25abf334441f3ed4cc3b91:/generator.c

diff --git a/generator.c b/generator.c
index 6eb65d24..68a996e2 100644
--- a/generator.c
+++ b/generator.c
@@ -42,11 +42,13 @@ extern int size_only;
 extern int io_timeout;
 extern int protocol_version;
 extern int always_checksum;
+extern char *partial_dir;
 extern char *compare_dest;
 extern int link_dest;
 extern int whole_file;
 extern int local_server;
 extern int list_only;
+extern int read_batch;
 extern int only_existing;
 extern int orig_umask;
 extern int safe_symlinks;
@@ -161,6 +163,7 @@ 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) {
@@ -205,19 +208,25 @@ 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(struct map_struct *buf, OFF_T len, int f_out)
+static void generate_and_send_sums(int fd, OFF_T len, int f_out)
 {
 	size_t i;
+	struct map_struct *mapbuf;
 	struct sum_struct sum;
 	OFF_T offset = 0;
 
 	sum_sizes_sqroot(&sum, len);
 
+	if (len > 0)
+		mapbuf = map_file(fd, len, 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);
-		char *map = map_ptr(buf, offset, n1);
+		char *map = map_ptr(mapbuf, offset, n1);
 		uint32 sum1 = get_checksum1(map, n1);
 		char sum2[SUM_LENGTH];
 
@@ -234,6 +243,9 @@ static void generate_and_send_sums(struct map_struct *buf, OFF_T len, int f_out)
 		len -= n1;
 		offset += n1;
 	}
+
+	if (mapbuf)
+		unmap_file(mapbuf);
 }
 
 
@@ -251,8 +263,7 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 {
 	int fd;
 	STRUCT_STAT st;
-	struct map_struct *mapbuf;
-	int statret;
+	int statret, stat_errno;
 	char *fnamecmp;
 	char fnamecmpbuf[MAXPATHLEN];
 
@@ -260,30 +271,32 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		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));
+	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 */
@@ -322,7 +335,7 @@ 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;
 	}
 
@@ -358,11 +371,12 @@ 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
@@ -377,15 +391,18 @@ 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);
@@ -398,7 +415,8 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		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;
 	}
 
@@ -406,67 +424,59 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 
 	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 (link_stat(fnamecmpbuf, &st, 0) == 0
+		    && S_ISREG(st.st_mode)) {
 #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 && !dry_run) {
+				if (do_link(fnamecmpbuf, fname) < 0) {
+					if (verbose) {
+						rsyserr(FINFO, errno,
+							"link %s => %s",
+							fnamecmpbuf,
+							safe_fname(fname));
+					}
+					fnamecmp = fnamecmpbuf;
 				}
-			}
-			fnamecmp = fnamecmpbuf;
-		}
+			} else
 #endif
-		else
-			fnamecmp = fnamecmpbuf;
+				fnamecmp = fnamecmpbuf;
+			statret = 0;
+		}
+	}
+
+	if (statret == 0 && !S_ISREG(st.st_mode)) {
+		if (delete_file(fname) != 0)
+			return;
+		statret = -1;
+		stat_errno = ENOENT;
 	}
 
 	if (statret == -1) {
 		if (preserve_hard_links && hard_link_check(file, HL_SKIP))
 			return;
-		if (errno == ENOENT) {
+		if (stat_errno == ENOENT) {
 			write_int(f_out,i);
-			if (!dry_run)
+			if (!dry_run && !read_batch)
 				write_sum_head(f_out, NULL);
 		} else if (verbose > 1) {
-			rsyserr(FERROR, errno,
-				"recv_generator: failed to open %s",
+			rsyserr(FERROR, stat_errno,
+				"recv_generator: failed to stat %s",
 				full_fname(fname));
 		}
 		return;
 	}
 
-	if (!S_ISREG(st.st_mode)) {
-		if (delete_file(fname) != 0) {
-			return;
-		}
-
-		/* now pretend the file didn't exist */
-		if (preserve_hard_links && hard_link_check(file, HL_SKIP))
-			return;
-		write_int(f_out,i);
-		if (!dry_run)
-			write_sum_head(f_out, NULL);
-		return;
-	}
-
 	if (opt_ignore_existing && 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
 	    && 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;
 	}
 
@@ -476,7 +486,7 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		return;
 	}
 
-	if (dry_run) {
+	if (dry_run || read_batch) {
 		write_int(f_out,i);
 		return;
 	}
@@ -487,6 +497,16 @@ 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;
+		}
+	}
+
 	/* open the file */
 	fd = do_open(fnamecmp, O_RDONLY, 0);
 
@@ -501,25 +521,18 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		return;
 	}
 
-	if (st.st_size > 0)
-		mapbuf = map_file(fd,st.st_size);
-	else
-		mapbuf = NULL;
-
 	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(mapbuf, st.st_size, f_out);
+	generate_and_send_sums(fd, st.st_size, f_out);
 
 	close(fd);
-	if (mapbuf)
-		unmap_file(mapbuf);
 }