X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/dfad66a83825d61031d7a61e11509a3c37ad61c4..3e870a64440a8244fb60fe69b2401d2dec90ce08:/sender.c

diff --git a/sender.c b/sender.c
index 7d7b5862..470b8243 100644
--- a/sender.c
+++ b/sender.c
@@ -20,11 +20,21 @@
 #include "rsync.h"
 
 extern int verbose;
-extern int csum_length;
-extern struct stats stats;
-extern int io_error;
 extern int dry_run;
 extern int am_server;
+extern int am_daemon;
+extern int log_before_transfer;
+extern int log_format_has_i;
+extern int daemon_log_format_has_i;
+extern int csum_length;
+extern int io_error;
+extern int protocol_version;
+extern int updating_basis_file;
+extern int make_backups;
+extern int do_progress;
+extern int inplace;
+extern struct stats stats;
+extern char *log_format;
 
 
 /**
@@ -35,70 +45,52 @@ extern int am_server;
  * machine holding the source files.
  **/
 
-
-void read_sum_head(int f, struct sum_struct *sum)
-{
-	extern int protocol_version;
-
-	sum->count = read_int(f);
-	sum->blength = read_int(f);
-	if (protocol_version < 27) {
-		sum->s2length = csum_length;
-	} else {
-		sum->s2length = read_int(f);
-		if (sum->s2length > MD4_SUM_LENGTH) {
-			rprintf(FERROR, "Invalid checksum length %d\n",
-			    sum->s2length);
-			exit_cleanup(RERR_PROTOCOL);
-		}
-	}
-	sum->remainder = read_int(f);
-}
-
 /**
  * Receive the checksums for a buffer
  **/
 static struct sum_struct *receive_sums(int f)
 {
 	struct sum_struct *s;
-	int i;
+	int32 i;
 	OFF_T offset = 0;
 
-	s = new(struct sum_struct);
-	if (!s) out_of_memory("receive_sums");
+	if (!(s = new(struct sum_struct)))
+		out_of_memory("receive_sums");
 
 	read_sum_head(f, s);
 
 	s->sums = NULL;
 
-	if (verbose > 3)
-		rprintf(FINFO, "count=%ld n=%ld rem=%ld\n",
-			(long) s->count, (long) s->blength,
-			(long) s->remainder);
+	if (verbose > 3) {
+		rprintf(FINFO, "count=%.0f n=%ld rem=%ld\n",
+			(double)s->count, (long)s->blength, (long)s->remainder);
+	}
 
 	if (s->count == 0)
 		return(s);
 
-	s->sums = new_array(struct sum_buf, s->count);
-	if (!s->sums) out_of_memory("receive_sums");
+	if (!(s->sums = new_array(struct sum_buf, s->count)))
+		out_of_memory("receive_sums");
 
-	for (i = 0; i < (int) s->count; i++) {
+	for (i = 0; i < s->count; i++) {
 		s->sums[i].sum1 = read_int(f);
 		read_buf(f, s->sums[i].sum2, s->s2length);
 
 		s->sums[i].offset = offset;
-		s->sums[i].i = i;
+		s->sums[i].flags = 0;
 
-		if (i == (int) s->count-1 && s->remainder != 0) {
+		if (i == s->count-1 && s->remainder != 0)
 			s->sums[i].len = s->remainder;
-		} else {
+		else
 			s->sums[i].len = s->blength;
-		}
 		offset += s->sums[i].len;
 
-		if (verbose > 3)
-			rprintf(FINFO, "chunk[%d] len=%d offset=%.0f sum1=%08x\n",
-				i, s->sums[i].len, (double)s->sums[i].offset, s->sums[i].sum1);
+		if (verbose > 3) {
+			rprintf(FINFO,
+				"chunk[%d] len=%d offset=%.0f sum1=%08x\n",
+				i, s->sums[i].len, (double)s->sums[i].offset,
+				s->sums[i].sum1);
+		}
 	}
 
 	s->flength = offset;
@@ -112,27 +104,23 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 {
 	int fd = -1;
 	struct sum_struct *s;
-	struct map_struct *buf = NULL;
+	struct map_struct *mbuf = NULL;
 	STRUCT_STAT st;
-	char fname[MAXPATHLEN];
-	int i;
+	char *fname2, fname[MAXPATHLEN];
+	int iflags;
 	struct file_struct *file;
 	int phase = 0;
-	extern struct stats stats;
 	struct stats initial_stats;
-	extern int write_batch;   /* dw */
-	extern int read_batch;    /* dw */
-	int checksums_match;   /* dw */
-	int buff_len;  /* dw */
-	char buff[CHUNK_SIZE];    /* dw */
-	int j;   /* dw */
-	int done;   /* dw */
+	int save_make_backups = make_backups;
+	int itemizing = am_daemon ? daemon_log_format_has_i
+		      : !am_server && log_format_has_i;
+	int i, j;
 
 	if (verbose > 2)
 		rprintf(FINFO, "send_files starting\n");
 
 	while (1) {
-		int offset = 0;
+		unsigned int offset;
 
 		i = read_int(f_in);
 		if (i == -1) {
@@ -142,6 +130,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 				write_int(f_out, -1);
 				if (verbose > 2)
 					rprintf(FINFO, "send_files phase=%d\n", phase);
+				/* For inplace: redo phase turns off the backup
+				 * flag so that we do a regular inplace send. */
+				make_backups = 0;
 				continue;
 			}
 			break;
@@ -154,154 +145,148 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		}
 
 		file = flist->files[i];
+		if (file->dir.root) {
+			/* N.B. We're sure that this fits, so offset is OK. */
+			offset = strlcpy(fname, file->dir.root, sizeof fname);
+			if (!offset || fname[offset-1] != '/')
+				fname[offset++] = '/';
+		} else
+			offset = 0;
+		fname2 = f_name_to(file, fname + offset);
 
-		stats.num_transferred_files++;
-		stats.total_transferred_size += file->length;
+		if (verbose > 2)
+			rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
 
-		fname[0] = 0;
-		if (file->basedir) {
-			strlcpy(fname, file->basedir, MAXPATHLEN);
-			if (strlen(fname) == MAXPATHLEN-1) {
-				io_error = 1;
-				rprintf(FERROR, "send_files failed on long-named directory %s\n",
-					full_fname(fname));
-				return;
+		if (protocol_version >= 29) {
+			iflags = read_shortint(f_in);
+			if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
+				int see_item = itemizing && (iflags || verbose > 1);
+				write_int(f_out, i);
+				write_shortint(f_out, iflags);
+				if (am_server) {
+					if (am_daemon && !dry_run && see_item)
+						log_send(file, &stats, iflags);
+				} else if (see_item || iflags & ITEM_UPDATING
+				    || (S_ISDIR(file->mode)
+				     && iflags & ITEM_REPORT_TIME))
+					log_send(file, &stats, iflags);
+				continue;
 			}
-			strlcat(fname, "/", MAXPATHLEN);
-			offset = strlen(file->basedir)+1;
+		} else
+			iflags = ITEM_UPDATING | ITEM_MISSING_DATA;
+
+		if (inplace && protocol_version >= 29) {
+			uchar fnamecmp_type = read_byte(f_in);
+			updating_basis_file = fnamecmp_type == FNAMECMP_FNAME;
+		} else
+			updating_basis_file = inplace && !make_backups;
+
+		if (!S_ISREG(file->mode)) {
+			rprintf(FERROR, "[%s] got index of non-regular file: %d\n",
+				who_am_i(), i);
+			exit_cleanup(RERR_PROTOCOL);
 		}
-		strlcat(fname, f_name(file), MAXPATHLEN);
 
-		if (verbose > 2)
-			rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
+		stats.current_file_index = i;
+		stats.num_transferred_files++;
+		stats.total_transferred_size += file->length;
 
-		if (dry_run) {
-			if (!am_server && verbose) {	/* log transfer */
-				rprintf(FINFO, "%s\n", fname+offset);
-			}
+		if (dry_run) { /* log the transfer */
+			if (!am_server && log_format)
+				log_send(file, &stats, iflags);
 			write_int(f_out, i);
+			if (protocol_version >= 29)
+				write_shortint(f_out, iflags);
 			continue;
 		}
 
 		initial_stats = stats;
 
-		s = receive_sums(f_in);
-		if (!s) {
-			io_error = 1;
+		if (!(s = receive_sums(f_in))) {
+			io_error |= IOERR_GENERAL;
 			rprintf(FERROR, "receive_sums failed\n");
 			return;
 		}
 
-		if (write_batch)
-			write_batch_csum_info(&i, flist->count, s);
-
-		if (!read_batch) {
-			fd = do_open(fname, O_RDONLY, 0);
-			if (fd == -1) {
-				io_error = 1;
-				rprintf(FERROR, "send_files failed to open %s: %s\n",
-					full_fname(fname), strerror(errno));
-				free_sums(s);
-				continue;
-			}
-
-			/* map the local file */
-			if (do_fstat(fd, &st) != 0) {
-				io_error = 1;
-				rprintf(FERROR, "fstat failed: %s\n", strerror(errno));
-				free_sums(s);
-				close(fd);
-				return;
-			}
-
-			if (st.st_size > 0) {
-				buf = map_file(fd, st.st_size);
+		fd = do_open(fname, O_RDONLY, 0);
+		if (fd == -1) {
+			if (errno == ENOENT) {
+				enum logcode c = am_daemon
+				    && protocol_version < 28 ? FERROR
+							     : FINFO;
+				io_error |= IOERR_VANISHED;
+				rprintf(c, "file has vanished: %s\n",
+					full_fname(fname));
 			} else {
-				buf = NULL;
+				io_error |= IOERR_GENERAL;
+				rsyserr(FERROR, errno,
+					"send_files failed to open %s",
+					full_fname(fname));
 			}
+			free_sums(s);
+			continue;
+		}
 
-			if (verbose > 2)
-				rprintf(FINFO, "send_files mapped %s of size %.0f\n",
-					fname, (double)st.st_size);
-
-			write_int(f_out, i);
+		/* map the local file */
+		if (do_fstat(fd, &st) != 0) {
+			io_error |= IOERR_GENERAL;
+			rsyserr(FERROR, errno, "fstat failed");
+			free_sums(s);
+			close(fd);
+			return;
+		}
 
-			if (write_batch)
-				write_batch_delta_file((char *)&i, sizeof(i));
+		if (st.st_size) {
+			int32 read_size = MAX(s->blength * 3, MAX_MAP_SIZE);
+			mbuf = map_file(fd, st.st_size, read_size, s->blength);
+		} else
+			mbuf = NULL;
 
-			write_sum_head(f_out, s);
+		if (verbose > 2) {
+			rprintf(FINFO, "send_files mapped %s of size %.0f\n",
+				safe_fname(fname), (double)st.st_size);
 		}
 
-		if (verbose > 2 && !read_batch)
-			rprintf(FINFO, "calling match_sums %s\n", fname);
+		write_int(f_out, i);
+		if (protocol_version >= 29)
+			write_shortint(f_out, iflags);
+		write_sum_head(f_out, s);
 
-		if (!am_server && verbose) {	/* log transfer */
-			rprintf(FINFO, "%s\n", fname+offset);
+		if (verbose > 2) {
+			rprintf(FINFO, "calling match_sums %s\n",
+				safe_fname(fname));
 		}
 
+		if (log_before_transfer)
+			log_send(file, &initial_stats, iflags);
+		else if (!am_server && verbose && do_progress)
+			rprintf(FINFO, "%s\n", safe_fname(fname2));
+
 		set_compression(fname);
 
-		if (read_batch) { /* dw */
-			/* read checksums originally computed on sender side */
-			read_batch_csum_info(i, s, &checksums_match);
-			if (checksums_match) {
-				read_batch_delta_file( (char *) &j, sizeof(int) );
-				if (j != i) {    /* if flist index entries don't match*/
-					rprintf(FINFO, "index mismatch in send_files\n");
-					rprintf(FINFO, "read index = %d flist ndx = %d\n", j, i);
-					close_batch_delta_file();
-					close_batch_csums_file();
-					exit_cleanup(1);
-				} else {
-					write_int(f_out, j);
-					write_sum_head(f_out, s);
-					done = 0;
-					while (!done) {
-						read_batch_delta_file( (char *) &buff_len, sizeof(int) );
-						write_int(f_out, buff_len);
-						if (buff_len == 0) {
-							done = 1;
-						} else {
-							if (buff_len > 0) {
-								read_batch_delta_file(buff, buff_len);
-								write_buf(f_out, buff, buff_len);
-							}
-						}
-					}  /* end while  */
-					read_batch_delta_file( buff, MD4_SUM_LENGTH);
-					write_buf(f_out, buff, MD4_SUM_LENGTH);
-
-				}  /* j=i */
-			} else {  /* not checksum match */
-				rprintf (FINFO, "readbatch & checksums don't match\n");
-				rprintf (FINFO, "filename=%s is being skipped\n", fname);
-				continue;
-			}
-		} else  {
-			match_sums(f_out, s, buf, st.st_size);
-			log_send(file, &initial_stats);
-		}
+		match_sums(f_out, s, mbuf, st.st_size);
+		if (!log_before_transfer)
+			log_send(file, &initial_stats, iflags);
 
-		if (!read_batch) { /* dw */
-			if (buf) {
-				j = unmap_file(buf);
-				if (j) {
-					io_error = 1;
-					rprintf(FERROR,
-					    "read errors mapping %s: (%d) %s\n",
-					    full_fname(fname),
-					    j,
-					    strerror(j));
-				}
+		if (mbuf) {
+			j = unmap_file(mbuf);
+			if (j) {
+				io_error |= IOERR_GENERAL;
+				rsyserr(FERROR, j,
+					"read errors mapping %s",
+					full_fname(fname));
 			}
-			close(fd);
 		}
+		close(fd);
 
 		free_sums(s);
 
-		if (verbose > 2)
-			rprintf(FINFO, "sender finished %s\n", fname);
+		if (verbose > 2) {
+			rprintf(FINFO, "sender finished %s\n",
+				safe_fname(fname));
+		}
 	}
+	make_backups = save_make_backups;
 
 	if (verbose > 2)
 		rprintf(FINFO, "send files finished\n");
@@ -309,14 +294,4 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 	match_report();
 
 	write_int(f_out, -1);
-	if (write_batch || read_batch) { /* dw */
-		close_batch_csums_file();
-		close_batch_delta_file();
-	}
-
 }
-
-
-
-
-