X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8715db2cab9feaae2db887be038b4a1ab6ec324d..32cbfe7b17ba8ec661fc27fd773909709d100e8a:/sender.c

diff --git a/sender.c b/sender.c
index 470b8243..b745f6f7 100644
--- a/sender.c
+++ b/sender.c
@@ -29,6 +29,7 @@ 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;
@@ -98,7 +99,32 @@ static struct sum_struct *receive_sums(int f)
 	return s;
 }
 
+static struct file_list *the_flist;
 
+void successful_send(int i)
+{
+	char fname[MAXPATHLEN];
+	struct file_struct *file;
+	unsigned int offset;
+
+	if (!the_flist || i < 0 || i >= the_flist->count)
+		return;
+
+	file = the_flist->files[i];
+	/* 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)
 {
@@ -119,6 +145,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 	if (verbose > 2)
 		rprintf(FINFO, "send_files starting\n");
 
+	the_flist = flist;
+
 	while (1) {
 		unsigned int offset;
 
@@ -139,6 +167,13 @@ 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);
@@ -176,8 +211,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 			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;
 
@@ -285,6 +319,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;