X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/85aa57a7dde68e67d62d7c30c87d8363e1bd449e..4d53c4dd46cae7aa1bb0ee512ff4676f9f7b29d3:/sender.c

diff --git a/sender.c b/sender.c
index 2d9c85b6..7999386f 100644
--- a/sender.c
+++ b/sender.c
@@ -125,11 +125,30 @@ void successful_send(int ndx)
 	}
 }
 
+static void write_item_attrs(int f_out, int ndx, int iflags, char *buf,
+			     uchar fnamecmp_type, int len)
+{
+	write_int(f_out, ndx);
+	if (protocol_version < 29)
+		return;
+	write_shortint(f_out, iflags);
+	if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
+		write_byte(f_out, fnamecmp_type);
+	if (iflags & ITEM_XNAME_FOLLOWS) {
+		if (len < 0)
+			len = strlen(buf);
+		write_vstring(f_out, buf, len);
+	}
+}
+
 /* This is also used by receive.c with f_out = -1. */
-int read_iflags(int f_in, int f_out, int ndx, char *buf)
+int read_item_attrs(int f_in, int f_out, int ndx, char *buf, uchar *type_ptr)
 {
+	int len;
+	uchar fnamecmp_type = FNAMECMP_FNAME;
 	int iflags = protocol_version >= 29 ? read_shortint(f_in)
-		   : ITEM_UPDATING | ITEM_MISSING_DATA;
+		   : ITEM_TRANSFER | ITEM_MISSING_DATA;
+	int isave = iflags; /* XXX remove soon */
 
 	/* Handle the new keep-alive (no-op) packet. */
 	if (ndx == the_file_list->count && iflags == ITEM_IS_NEW)
@@ -144,11 +163,35 @@ int read_iflags(int f_in, int f_out, int ndx, char *buf)
 		exit_cleanup(RERR_PROTOCOL);
 	}
 
-	*buf = '\0';
+	if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
+		fnamecmp_type = read_byte(f_in);
+	*type_ptr = fnamecmp_type;
+
+	if (iflags & ITEM_XNAME_FOLLOWS) {
+		if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
+			exit_cleanup(RERR_PROTOCOL);
+	} else {
+		*buf = '\0';
+		len = -1;
+	}
+
+	/* XXX Temporary backward compatibility when talking to 2.6.4pre[12] */
+	if (protocol_version >= 29 && iflags & ITEM_TRANSFER
+	    && !S_ISREG(the_file_list->files[ndx]->mode)) {
+		iflags &= ~ITEM_TRANSFER;
+		iflags |= ITEM_LOCAL_CHANGE;
+	}
 
-	if ((!(iflags & ITEM_UPDATING) || !S_ISREG(the_file_list->files[ndx]->mode)) && f_out >= 0) {
-		write_int(f_out, ndx);
-		write_shortint(f_out, iflags);
+	if (iflags & ITEM_TRANSFER) {
+		if (!S_ISREG(the_file_list->files[ndx]->mode)) {
+			rprintf(FERROR,
+				"received index of non-regular file: %d [%s]\n",
+				ndx, who_am_i());
+			exit_cleanup(RERR_PROTOCOL);
+		}
+	} else if (f_out >= 0) {
+		write_item_attrs(f_out, ndx, isave /*XXX iflags */,
+				 buf, fnamecmp_type, len);
 	}
 
 	return iflags;
@@ -162,6 +205,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 	STRUCT_STAT st;
 	char *fname2, fname[MAXPATHLEN];
 	char fnametmp[MAXPATHLEN];
+	uchar fnamecmp_type;
 	int iflags;
 	struct file_struct *file;
 	int phase = 0;
@@ -193,7 +237,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 			break;
 		}
 
-		iflags = read_iflags(f_in, f_out, i, fnametmp);
+		iflags = read_item_attrs(f_in, f_out, i, fnametmp,
+					 &fnamecmp_type);
 		if (iflags == ITEM_IS_NEW) /* no-op packet */
 			continue;
 
@@ -210,22 +255,17 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		if (verbose > 2)
 			rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
 
-		if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
+		if (!(iflags & ITEM_TRANSFER)) {
 			maybe_log_item(file, iflags, itemizing, fnametmp);
 			continue;
 		}
 
-		if (inplace && protocol_version >= 29) {
-			updating_basis_file = !(iflags & ITEM_USING_ALT_BASIS);
+		if (protocol_version >= 29) {
+			updating_basis_file = inplace
+					   && 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);
-		}
-
 		stats.current_file_index = i;
 		stats.num_transferred_files++;
 		stats.total_transferred_size += file->length;
@@ -233,9 +273,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		if (dry_run) { /* log the transfer */
 			if (!am_server && log_format)
 				log_item(file, &stats, iflags, NULL);
-			write_int(f_out, i);
-			if (protocol_version >= 29)
-				write_shortint(f_out, iflags);
+			write_item_attrs(f_out, i, iflags, fnametmp,
+					 fnamecmp_type, -1);
 			continue;
 		}
 
@@ -286,9 +325,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 				safe_fname(fname), (double)st.st_size);
 		}
 
-		write_int(f_out, i);
-		if (protocol_version >= 29)
-			write_shortint(f_out, iflags);
+		write_item_attrs(f_out, i, iflags, fnametmp, fnamecmp_type, -1);
 		write_sum_head(f_out, s);
 
 		if (verbose > 2) {
@@ -304,6 +341,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		set_compression(fname);
 
 		match_sums(f_out, s, mbuf, st.st_size);
+		if (do_progress)
+			end_progress(st.st_size);
+
 		if (!log_before_transfer)
 			log_item(file, &initial_stats, iflags, NULL);