X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5f40615cd5a92fb4aa69a096dd035a45ae697083..0394e34a69e7051012125dc4e49d8d928ce15290:/sender.c

diff --git a/sender.c b/sender.c
index 9ba82113..39988225 100644
--- a/sender.c
+++ b/sender.c
@@ -125,6 +125,62 @@ void successful_send(int ndx)
 	}
 }
 
+/* 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 len;
+	int iflags = protocol_version >= 29 ? read_shortint(f_in)
+		   : 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)
+		;
+	else if (ndx < 0 || ndx >= the_file_list->count) {
+		rprintf(FERROR, "Invalid file index %d (count=%d) [%s]\n",
+			ndx, the_file_list->count, who_am_i());
+		exit_cleanup(RERR_PROTOCOL);
+	} else if (iflags == ITEM_IS_NEW) {
+		rprintf(FERROR, "Invalid itemized flag word [%s]\n",
+			who_am_i());
+		exit_cleanup(RERR_PROTOCOL);
+	}
+
+	if (iflags & ITEM_HARD_LINKED)
+		len = read_vstring(f_in, buf, MAXPATHLEN);
+	else {
+		*buf = '\0';
+		len = -1;
+	}
+
+	/* XXX Temporary compatibility hack */
+	if (iflags & ITEM_REPORT_XATTRS) { /* old ITEM_UPDATE */
+		iflags &= ~ITEM_REPORT_XATTRS;
+		if (!(iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE))) {
+			if (S_ISREG(the_file_list->files[ndx]->mode))
+				iflags |= ITEM_TRANSFER;
+			else
+				iflags |= ITEM_LOCAL_CHANGE;
+		}
+	}
+
+	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_int(f_out, ndx);
+		write_shortint(f_out, isave /*XXX iflags */);
+		if (len >= 0)
+			write_vstring(f_out, buf, len);
+	}
+
+	return iflags;
+}
+
 void send_files(struct file_list *flist, int f_out, int f_in)
 {
 	int fd = -1;
@@ -132,6 +188,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 	struct map_struct *mbuf = NULL;
 	STRUCT_STAT st;
 	char *fname2, fname[MAXPATHLEN];
+	char fnametmp[MAXPATHLEN];
 	int iflags;
 	struct file_struct *file;
 	int phase = 0;
@@ -163,18 +220,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 			break;
 		}
 
-		if (i < 0 || i >= flist->count) {
-			/* Handle the new keep-alive (no-op) packet. */
-			if (i == flist->count && protocol_version >= 29
-	 		    && read_shortint(f_in) == ITEM_IS_NEW) {
-				write_int(f_out, i);
-				write_shortint(f_out, ITEM_IS_NEW);
-				continue;
-			}
-			rprintf(FERROR, "Invalid file index %d (count=%d)\n",
-				i, flist->count);
-			exit_cleanup(RERR_PROTOCOL);
-		}
+		iflags = read_iflags(f_in, f_out, i, fnametmp);
+		if (iflags == ITEM_IS_NEW) /* no-op packet */
+			continue;
 
 		file = flist->files[i];
 		if (file->dir.root) {
@@ -189,45 +237,26 @@ 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 (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;
-			}
-		} else
-			iflags = ITEM_UPDATING | ITEM_MISSING_DATA;
+		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);
 		} 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;
 
 		if (dry_run) { /* log the transfer */
 			if (!am_server && log_format)
-				log_send(file, &stats, iflags);
+				log_item(file, &stats, iflags, NULL);
 			write_int(f_out, i);
 			if (protocol_version >= 29)
-				write_shortint(f_out, iflags);
+				write_shortint(f_out, iflags | ITEM_REPORT_XATTRS);
 			continue;
 		}
 
@@ -280,7 +309,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
 		write_int(f_out, i);
 		if (protocol_version >= 29)
-			write_shortint(f_out, iflags);
+			write_shortint(f_out, iflags | ITEM_REPORT_XATTRS);
 		write_sum_head(f_out, s);
 
 		if (verbose > 2) {
@@ -289,15 +318,18 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		}
 
 		if (log_before_transfer)
-			log_send(file, &initial_stats, iflags);
+			log_item(file, &initial_stats, iflags, NULL);
 		else if (!am_server && verbose && do_progress)
 			rprintf(FINFO, "%s\n", safe_fname(fname2));
 
 		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_send(file, &initial_stats, iflags);
+			log_item(file, &initial_stats, iflags, NULL);
 
 		if (mbuf) {
 			j = unmap_file(mbuf);