X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d2a918b4544d476b777c2cc69494659328f50987..a41a1e87182410ec6c2eeaddb0cd961ec554c404:/receiver.c

diff --git a/receiver.c b/receiver.c
index 9c661810..f10f25d4 100644
--- a/receiver.c
+++ b/receiver.c
@@ -22,13 +22,15 @@
 
 extern int verbose;
 extern int recurse;
-extern int delete_mode;
 extern int delete_after;
 extern int max_delete;
 extern int csum_length;
 extern struct stats stats;
 extern int dry_run;
+extern int read_batch;
+extern int batch_gen_fd;
 extern int am_server;
+extern int protocol_version;
 extern int relative_paths;
 extern int keep_dirlinks;
 extern int preserve_hard_links;
@@ -36,7 +38,8 @@ extern int preserve_perms;
 extern int cvs_exclude;
 extern int io_error;
 extern char *tmpdir;
-extern char *compare_dest;
+extern char *partial_dir;
+extern char *basis_dir[];
 extern int make_backups;
 extern int do_progress;
 extern char *backup_dir;
@@ -48,6 +51,10 @@ extern int ignore_errors;
 extern int orig_umask;
 extern int keep_partial;
 extern int checksum_seed;
+extern int inplace;
+
+extern struct exclude_list_struct server_exclude_list;
+
 
 static void delete_one(char *fn, int is_dir)
 {
@@ -56,20 +63,18 @@ static void delete_one(char *fn, int is_dir)
 			rsyserr(FERROR, errno, "delete_one: unlink %s failed",
 				full_fname(fn));
 		} else if (verbose)
-			rprintf(FINFO, "deleting %s\n", fn);
+			rprintf(FINFO, "deleting %s\n", safe_fname(fn));
 	} else {
 		if (do_rmdir(fn) != 0) {
-			if (errno == ENOTDIR && keep_dirlinks) {
-				delete_one(fn, 0);
-				return;
-			}
 			if (errno != ENOTEMPTY && errno != EEXIST) {
 				rsyserr(FERROR, errno,
 					"delete_one: rmdir %s failed",
 					full_fname(fn));
 			}
-		} else if (verbose)
-			rprintf(FINFO, "deleting directory %s\n", fn);
+		} else if (verbose) {
+			rprintf(FINFO, "deleting directory %s\n",
+				safe_fname(fn));
+		}
 	}
 }
 
@@ -109,23 +114,25 @@ void delete_files(struct file_list *flist)
 			continue;
 
 		if (verbose > 1)
-			rprintf(FINFO, "deleting in %s\n", fbuf);
+			rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf));
 
 		for (i = local_file_list->count-1; i >= 0; i--) {
-			if (max_delete && deletion_count > max_delete)
+			if (max_delete && deletion_count >= max_delete)
 				break;
 			if (!local_file_list->files[i]->basename)
 				continue;
 			if (flist_find(flist,local_file_list->files[i]) < 0) {
 				char *f = f_name(local_file_list->files[i]);
-				if (make_backups && (backup_dir || !is_backup_file(f))) {
+				int mode = local_file_list->files[i]->mode;
+				if (make_backups && (backup_dir || !is_backup_file(f))
+				  && !S_ISDIR(mode)) {
 					make_backup(f);
-					if (verbose)
-						rprintf(FINFO, "deleting %s\n", f);
-				} else {
-					int mode = local_file_list->files[i]->mode;
+					if (verbose) {
+						rprintf(FINFO, "deleting %s\n",
+							safe_fname(f));
+					}
+				} else
 					delete_one(f, S_ISDIR(mode) != 0);
-				}
 				deletion_count++;
 			}
 		}
@@ -195,21 +202,32 @@ static int get_tmpname(char *fnametmp, char *fname)
 }
 
 
-static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
-			OFF_T total_size)
+static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+			char *fname, int fd, OFF_T total_size)
 {
-	int i;
+	static char file_sum1[MD4_SUM_LENGTH];
+	static char file_sum2[MD4_SUM_LENGTH];
+	struct map_struct *mapbuf;
 	struct sum_struct sum;
-	unsigned int len;
+	int32 len;
 	OFF_T offset = 0;
 	OFF_T offset2;
 	char *data;
-	static char file_sum1[MD4_SUM_LENGTH];
-	static char file_sum2[MD4_SUM_LENGTH];
+	int32 i;
 	char *map = NULL;
 
 	read_sum_head(f_in, &sum);
 
+	if (fd_r >= 0 && size_r > 0) {
+		OFF_T map_size = MAX((OFF_T)sum.blength * 2, 16*1024);
+		mapbuf = map_file(fd_r, size_r, map_size, sum.blength);
+		if (verbose > 2) {
+			rprintf(FINFO, "recv mapped %s of size %.0f\n",
+				safe_fname(fname_r), (double)size_r);
+		}
+	} else
+		mapbuf = NULL;
+
 	sum_init(checksum_seed);
 
 	while ((i = recv_token(f_in, &data)) != 0) {
@@ -225,50 +243,67 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
 			stats.literal_data += i;
 			cleanup_got_literal = 1;
 
-			sum_update(data,i);
+			sum_update(data, i);
 
-			if (fd != -1 && write_file(fd,data,i) != i) {
-				rsyserr(FERROR, errno, "write failed on %s",
-					full_fname(fname));
-				exit_cleanup(RERR_FILEIO);
-			}
+			if (fd != -1 && write_file(fd,data,i) != i)
+				goto report_write_error;
 			offset += i;
 			continue;
 		}
 
 		i = -(i+1);
-		offset2 = i*(OFF_T)sum.blength;
+		offset2 = i * (OFF_T)sum.blength;
 		len = sum.blength;
 		if (i == (int)sum.count-1 && sum.remainder != 0)
 			len = sum.remainder;
 
 		stats.matched_data += len;
 
-		if (verbose > 3)
-			rprintf(FINFO,"chunk[%d] of size %d at %.0f offset=%.0f\n",
-				i,len,(double)offset2,(double)offset);
+		if (verbose > 3) {
+			rprintf(FINFO,
+				"chunk[%d] of size %ld at %.0f offset=%.0f\n",
+				i, (long)len, (double)offset2, (double)offset);
+		}
 
 		if (mapbuf) {
 			map = map_ptr(mapbuf,offset2,len);
 
 			see_token(map, len);
-			sum_update(map,len);
+			sum_update(map, len);
 		}
 
-		if (fd != -1 && write_file(fd, map, len) != (int)len) {
-			rsyserr(FERROR, errno, "write failed on %s",
-				full_fname(fname));
-			exit_cleanup(RERR_FILEIO);
+		if (inplace) {
+			if (offset == offset2 && fd != -1) {
+				if (flush_write_file(fd) < 0)
+					goto report_write_error;
+				offset += len;
+				if (do_lseek(fd, len, SEEK_CUR) != offset) {
+					rsyserr(FERROR, errno,
+						"lseek failed on %s",
+						full_fname(fname));
+					exit_cleanup(RERR_FILEIO);
+				}
+				continue;
+			}
 		}
+		if (fd != -1 && write_file(fd, map, len) != (int)len)
+			goto report_write_error;
 		offset += len;
 	}
 
-	flush_write_file(fd);
+	if (flush_write_file(fd) < 0)
+		goto report_write_error;
+
+#ifdef HAVE_FTRUNCATE
+	if (inplace && fd != -1)
+		ftruncate(fd, offset);
+#endif
 
 	if (do_progress)
 		end_progress(total_size);
 
 	if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
+	    report_write_error:
 		rsyserr(FERROR, errno, "write failed on %s",
 			full_fname(fname));
 		exit_cleanup(RERR_FILEIO);
@@ -276,6 +311,9 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
 
 	sum_end(file_sum1);
 
+	if (mapbuf)
+		unmap_file(mapbuf);
+
 	read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
 	if (verbose > 2)
 		rprintf(FINFO,"got file_sum\n");
@@ -285,20 +323,27 @@ static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
 }
 
 
+static void discard_receive_data(int f_in, OFF_T length)
+{
+	receive_data(f_in, NULL, -1, 0, NULL, -1, length);
+}
+
+
 /**
  * main routine for receiver process.
  *
  * Receiver process runs on the same host as the generator process. */
-int recv_files(int f_in,struct file_list *flist,char *local_name)
+int recv_files(int f_in, struct file_list *flist, char *local_name,
+	       int f_in_name)
 {
+	int next_gen_i = -1;
 	int fd1,fd2;
 	STRUCT_STAT st;
 	char *fname, fbuf[MAXPATHLEN];
 	char template[MAXPATHLEN];
 	char fnametmp[MAXPATHLEN];
-	char *fnamecmp;
+	char *fnamecmp, *partialptr;
 	char fnamecmpbuf[MAXPATHLEN];
-	struct map_struct *mapbuf;
 	struct file_struct *file;
 	struct stats initial_stats;
 	int save_make_backups = make_backups;
@@ -317,8 +362,20 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 
 		i = read_int(f_in);
 		if (i == -1) {
+			if (read_batch) {
+				if (next_gen_i != flist->count) {
+					do {
+						if (f_in_name >= 0
+						    && next_gen_i >= 0)
+							read_byte(f_in_name);
+					} while (read_int(batch_gen_fd) != -1);
+				}
+				next_gen_i = -1;
+			}
+
 			if (phase)
 				break;
+
 			phase = 1;
 			csum_length = SUM_LENGTH;
 			if (verbose > 2)
@@ -348,33 +405,71 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 			fname = f_name_to(file, fbuf);
 
 		if (dry_run) {
-			if (!am_server && verbose)
-				rprintf(FINFO, "%s\n", fname);
+			if (!am_server && verbose) /* log the transfer */
+				rprintf(FINFO, "%s\n", safe_fname(fname));
 			continue;
 		}
 
 		initial_stats = stats;
 
 		if (verbose > 2)
-			rprintf(FINFO,"recv_files(%s)\n",fname);
+			rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
+
+		if (read_batch) {
+			while (i > next_gen_i) {
+				if (f_in_name >= 0 && next_gen_i >= 0)
+					read_byte(f_in_name);
+				next_gen_i = read_int(batch_gen_fd);
+				if (next_gen_i == -1)
+					next_gen_i = flist->count;
+			}
+			if (i < next_gen_i) {
+				rprintf(FINFO, "skipping update for \"%s\"\n",
+					safe_fname(fname));
+				discard_receive_data(f_in, file->length);
+				continue;
+			}
+			next_gen_i = -1;
+		}
 
-		fnamecmp = fname;
+		if (server_exclude_list.head
+		    && check_exclude(&server_exclude_list, fname,
+				     S_ISDIR(file->mode)) < 0) {
+			rprintf(FERROR, "attempt to hack rsync failed.\n");
+			exit_cleanup(RERR_PROTOCOL);
+		}
+
+		partialptr = partial_dir ? partial_dir_fname(fname) : fname;
+
+		if (f_in_name >= 0) {
+			uchar j;
+			switch (j = read_byte(f_in_name)) {
+			case FNAMECMP_FNAME:
+				fnamecmp = fname;
+				break;
+			case FNAMECMP_PARTIAL_DIR:
+				fnamecmp = partialptr ? partialptr : fname;
+				break;
+			case FNAMECMP_BACKUP:
+				fnamecmp = get_backup_name(fname);
+				break;
+			case FNAMECMP_BASIS_DIR:
+			default:
+				pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+					 basis_dir[j], fname);
+				fnamecmp = fnamecmpbuf;
+				break;
+			}
+		} else
+			fnamecmp = fname;
 
 		/* open the file */
 		fd1 = do_open(fnamecmp, O_RDONLY, 0);
 
-		if (fd1 == -1 && compare_dest != NULL) {
-			/* try the file at compare_dest instead */
-			pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-				 compare_dest, fname);
-			fnamecmp = fnamecmpbuf;
-			fd1 = do_open(fnamecmp, O_RDONLY, 0);
-		}
-
 		if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
 			rsyserr(FERROR, errno, "fstat %s failed",
 				full_fname(fnamecmp));
-			receive_data(f_in,NULL,-1,NULL,file->length);
+			discard_receive_data(f_in, file->length);
 			close(fd1);
 			continue;
 		}
@@ -387,7 +482,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 			 */
 			rprintf(FERROR,"recv_files: %s is a directory\n",
 				full_fname(fnamecmp));
-			receive_data(f_in, NULL, -1, NULL, file->length);
+			discard_receive_data(f_in, file->length);
 			close(fd1);
 			continue;
 		}
@@ -395,7 +490,6 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 		if (fd1 != -1 && !S_ISREG(st.st_mode)) {
 			close(fd1);
 			fd1 = -1;
-			mapbuf = NULL;
 		}
 
 		if (fd1 != -1 && !preserve_perms) {
@@ -405,64 +499,65 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 			file->mode = st.st_mode;
 		}
 
-		if (fd1 != -1 && st.st_size > 0) {
-			mapbuf = map_file(fd1,st.st_size);
-			if (verbose > 2) {
-				rprintf(FINFO, "recv mapped %s of size %.0f\n",
-					fnamecmp, (double)st.st_size);
+		/* We now check to see if we are writing file "inplace" */
+		if (inplace)  {
+			fd2 = do_open(fname, O_WRONLY|O_CREAT, 0);
+			if (fd2 == -1) {
+				rsyserr(FERROR, errno, "open %s failed",
+					full_fname(fname));
+				discard_receive_data(f_in, file->length);
+				if (fd1 != -1)
+					close(fd1);
+				continue;
+			}
+		} else {
+			if (!get_tmpname(fnametmp,fname)) {
+				discard_receive_data(f_in, file->length);
+				if (fd1 != -1)
+					close(fd1);
+				continue;
 			}
-		} else
-			mapbuf = NULL;
 
-		if (!get_tmpname(fnametmp,fname)) {
-			if (mapbuf)
-				unmap_file(mapbuf);
-			if (fd1 != -1)
-				close(fd1);
-			continue;
-		}
+			strlcpy(template, fnametmp, sizeof template);
 
-		strlcpy(template, fnametmp, sizeof template);
-
-		/* we initially set the perms without the
-		 * setuid/setgid bits to ensure that there is no race
-		 * condition. They are then correctly updated after
-		 * the lchown. Thanks to snabb@epipe.fi for pointing
-		 * this out.  We also set it initially without group
-		 * access because of a similar race condition. */
-		fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
-
-		/* in most cases parent directories will already exist
-		 * because their information should have been previously
-		 * transferred, but that may not be the case with -R */
-		if (fd2 == -1 && relative_paths && errno == ENOENT &&
-		    create_directory_path(fnametmp, orig_umask) == 0) {
-			strlcpy(fnametmp, template, sizeof fnametmp);
+			/* we initially set the perms without the
+			 * setuid/setgid bits to ensure that there is no race
+			 * condition. They are then correctly updated after
+			 * the lchown. Thanks to snabb@epipe.fi for pointing
+			 * this out.  We also set it initially without group
+			 * access because of a similar race condition. */
 			fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
-		}
-		if (fd2 == -1) {
-			rsyserr(FERROR, errno, "mkstemp %s failed",
-				full_fname(fnametmp));
-			receive_data(f_in,mapbuf,-1,NULL,file->length);
-			if (mapbuf)
-				unmap_file(mapbuf);
-			if (fd1 != -1)
-				close(fd1);
-			continue;
-		}
 
-		cleanup_set(fnametmp, fname, file, mapbuf, fd1, fd2);
+			/* in most cases parent directories will already exist
+			 * because their information should have been previously
+			 * transferred, but that may not be the case with -R */
+			if (fd2 == -1 && relative_paths && errno == ENOENT
+			    && create_directory_path(fnametmp, orig_umask) == 0) {
+				strlcpy(fnametmp, template, sizeof fnametmp);
+				fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
+			}
+			if (fd2 == -1) {
+				rsyserr(FERROR, errno, "mkstemp %s failed",
+					full_fname(fnametmp));
+				discard_receive_data(f_in, file->length);
+				if (fd1 != -1)
+					close(fd1);
+				continue;
+			}
+
+			if (partialptr)
+				cleanup_set(fnametmp, partialptr, file, fd1, fd2);
+		}
 
-		if (!am_server && verbose)
-			rprintf(FINFO, "%s\n", fname);
+		if (!am_server && verbose) /* log the transfer */
+			rprintf(FINFO, "%s\n", safe_fname(fname));
 
 		/* recv file data */
-		recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length);
+		recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
+				       fname, fd2, file->length);
 
 		log_recv(file, &initial_stats);
 
-		if (mapbuf)
-			unmap_file(mapbuf);
 		if (fd1 != -1)
 			close(fd1);
 		if (close(fd2) < 0) {
@@ -471,21 +566,48 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 			exit_cleanup(RERR_FILEIO);
 		}
 
-		if (recv_ok || keep_partial)
+		if (recv_ok || inplace)
 			finish_transfer(fname, fnametmp, file, recv_ok);
-		else
+		else if (keep_partial && partialptr
+		    && handle_partial_dir(partialptr, PDIR_CREATE))
+			finish_transfer(partialptr, fnametmp, file, 0);
+		else {
+			partialptr = NULL;
 			do_unlink(fnametmp);
+		}
+
+		if (partialptr != fname && fnamecmp == partialptr && recv_ok) {
+			do_unlink(partialptr);
+			handle_partial_dir(partialptr, PDIR_DELETE);
+		}
 
 		cleanup_disable();
 
 		if (!recv_ok) {
-			if (csum_length == SUM_LENGTH) {
-				rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
-					full_fname(fname));
-			} else {
+			int msgtype = csum_length == SUM_LENGTH || read_batch ?
+				FERROR : FINFO;
+			if (msgtype == FERROR || verbose) {
+				char *errstr, *redostr, *keptstr;
+				if (!(keep_partial && partialptr) && !inplace)
+					keptstr = "discarded";
+				else if (partial_dir)
+					keptstr = "put into partial-dir";
+				else
+					keptstr = "retained";
+				if (msgtype == FERROR) {
+					errstr = "ERROR";
+					redostr = "";
+				} else {
+					errstr = "WARNING";
+					redostr = " (will try again)";
+				}
+				rprintf(msgtype,
+					"%s: %s failed verification -- update %s%s.\n",
+					errstr, safe_fname(fname),
+					keptstr, redostr);
+			}
+			if (csum_length != SUM_LENGTH) {
 				char buf[4];
-				if (verbose > 1)
-					rprintf(FINFO,"redoing %s(%d)\n",fname,i);
 				SIVAL(buf, 0, i);
 				send_msg(MSG_REDO, buf, 4);
 			}
@@ -493,8 +615,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 	}
 	make_backups = save_make_backups;
 
-	if (delete_after && recurse && delete_mode && !local_name
-	    && flist->count > 0)
+	if (delete_after && recurse && !local_name && flist->count > 0)
 		delete_files(flist);
 
 	if (verbose > 2)