X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8a9cfb24590872230f6928cf00f5b994b3f537dc..b694f8a245b19c0e2c80fbeac5b2c991cfb2ced9:/sender.c

diff --git a/sender.c b/sender.c
index 5524b6f6..b08437db 100644
--- a/sender.c
+++ b/sender.c
@@ -20,21 +20,23 @@
 #include "rsync.h"
 
 extern int verbose;
-extern int itemize_changes;
-extern int log_before_transfer;
-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 remove_sent_files;
 extern int updating_basis_file;
 extern int make_backups;
 extern int do_progress;
 extern int inplace;
-extern char *log_format;
 extern struct stats stats;
+extern struct file_list *the_file_list;
+extern char *log_format;
 
 
 /**
@@ -98,7 +100,30 @@ static struct sum_struct *receive_sums(int f)
 	return s;
 }
 
-
+void successful_send(int ndx)
+{
+	char fname[MAXPATHLEN];
+	struct file_struct *file;
+	unsigned int offset;
+
+	if (ndx < 0 || ndx >= the_file_list->count)
+		return;
+
+	file = the_file_list->files[ndx];
+	/* The generator might tell us about symlinks we didn't send. */
+	if (!(file->flags & FLAG_SENT) && !S_ISLNK(file->mode))
+		return;
+	if (file->dir.root) {
+		offset = stringjoin(fname, sizeof fname,
+				    file->dir.root, "/", NULL);
+	} else
+		offset = 0;
+	f_name_to(file, fname + offset);
+	if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1) {
+		rprintf(FINFO, "sender removed %s\n",
+			safe_fname(fname + offset));
+	}
+}
 
 void send_files(struct file_list *flist, int f_out, int f_in)
 {
@@ -112,6 +137,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 	int phase = 0;
 	struct stats initial_stats;
 	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)
@@ -137,29 +164,51 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		}
 
 		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);
 		}
 
 		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);
+
+		if (verbose > 2)
+			rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
 
-		if (itemize_changes) {
-			iflags = read_byte(f_in);
+		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) {
-					write_int(f_out, i);
-					write_byte(f_out, iflags);
-				} else
-					log_send(file, &stats, iflags);
+					if (am_daemon && !dry_run && see_item)
+						log_item(file, &stats, iflags, NULL);
+				} else if (see_item || iflags & ITEM_UPDATING
+				    || (S_ISDIR(file->mode)
+				     && iflags & ITEM_REPORT_TIME))
+					log_item(file, &stats, iflags, NULL);
 				continue;
 			}
 		} 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;
+			updating_basis_file = !(iflags & ITEM_USING_ALT_BASIS);
 		} else
 			updating_basis_file = inplace && !make_backups;
 
@@ -173,26 +222,12 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		stats.num_transferred_files++;
 		stats.total_transferred_size += file->length;
 
-		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);
-
-		if (verbose > 2)
-			rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
-
 		if (dry_run) { /* log the transfer */
-			if (!am_server && verbose && !log_format)
-				rprintf(FINFO, "%s\n", safe_fname(fname2));
-			else if (!am_server)
-				log_send(file, &stats, iflags);
+			if (!am_server && log_format)
+				log_item(file, &stats, iflags, NULL);
 			write_int(f_out, i);
-			if (itemize_changes)
-				write_byte(f_out, iflags);
+			if (protocol_version >= 29)
+				write_shortint(f_out, iflags);
 			continue;
 		}
 
@@ -244,8 +279,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		}
 
 		write_int(f_out, i);
-		if (itemize_changes)
-			write_byte(f_out, iflags);
+		if (protocol_version >= 29)
+			write_shortint(f_out, iflags);
 		write_sum_head(f_out, s);
 
 		if (verbose > 2) {
@@ -254,15 +289,15 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		}
 
 		if (log_before_transfer)
-			log_send(file, &initial_stats, iflags);
-		else if (!am_server && verbose && (!log_format || do_progress))
+			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 (!log_before_transfer)
-			log_send(file, &initial_stats, iflags);
+			log_item(file, &initial_stats, iflags, NULL);
 
 		if (mbuf) {
 			j = unmap_file(mbuf);
@@ -281,6 +316,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 			rprintf(FINFO, "sender finished %s\n",
 				safe_fname(fname));
 		}
+
+		/* Flag that we actually sent this entry. */
+		file->flags |= FLAG_SENT;
 	}
 	make_backups = save_make_backups;