X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4bb0af79b7c58431d17add7ad6506989ab61a1cb..cd6bececc1576edf3d463d8ed30a8e867ca7f43b:/receiver.c

diff --git a/receiver.c b/receiver.c
index e0dacd83..719a58bb 100644
--- a/receiver.c
+++ b/receiver.c
@@ -21,27 +21,27 @@
 #include "rsync.h"
 
 extern int verbose;
+extern int dry_run;
+extern int am_daemon;
+extern int am_server;
+extern int do_progress;
 extern int log_before_transfer;
+extern int log_format_has_i;
+extern int daemon_log_format_has_i;
 extern int delete_after;
 extern int csum_length;
-extern struct stats stats;
-extern int dry_run;
 extern int read_batch;
 extern int batch_gen_fd;
-extern int am_server;
 extern int protocol_version;
 extern int relative_paths;
 extern int keep_dirlinks;
 extern int preserve_hard_links;
 extern int preserve_perms;
 extern int io_error;
-extern char *tmpdir;
-extern char *partial_dir;
-extern char *basis_dir[];
 extern int basis_dir_cnt;
 extern int make_backups;
-extern int do_progress;
 extern int cleanup_got_literal;
+extern int remove_sent_files;
 extern int module_id;
 extern int ignore_errors;
 extern int orig_umask;
@@ -49,7 +49,11 @@ extern int keep_partial;
 extern int checksum_seed;
 extern int inplace;
 extern int delay_updates;
+extern struct stats stats;
 extern char *log_format;
+extern char *tmpdir;
+extern char *partial_dir;
+extern char *basis_dir[];
 
 extern struct filter_list_struct server_filter_list;
 
@@ -309,12 +313,14 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 	char *fname, fbuf[MAXPATHLEN];
 	char template[MAXPATHLEN];
 	char fnametmp[MAXPATHLEN];
-	char *fnamecmp, *partialptr;
+	char *fnamecmp, *partialptr, numbuf[4];
 	char fnamecmpbuf[MAXPATHLEN];
 	uchar *delayed_bits = NULL;
 	struct file_struct *file;
 	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, recv_ok, phase = 0;
 
 	if (verbose > 2)
@@ -368,12 +374,21 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 		}
 
 		file = flist->files[i];
+		fname = local_name ? local_name : f_name_to(file, fbuf);
+
+		if (verbose > 2)
+			rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
 
 		if (protocol_version >= 29) {
-			iflags = read_byte(f_in);
-			iflags |= read_byte(f_in) << 8;
+			iflags = read_shortint(f_in);
 			if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
-				if (!dry_run || !am_server)
+				int see_item = itemizing && (iflags || verbose > 1);
+				if (am_server) {
+					if (am_daemon && !dry_run && see_item)
+						log_recv(file, &stats, iflags);
+				} else if (see_item || iflags & ITEM_UPDATING
+				    || (S_ISDIR(file->mode)
+				     && iflags & ITEM_REPORT_TIME))
 					log_recv(file, &stats, iflags);
 				continue;
 			}
@@ -391,17 +406,12 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 		stats.total_transferred_size += file->length;
 		cleanup_got_literal = 0;
 
-		fname = local_name ? local_name : f_name_to(file, fbuf);
-
 		if (server_filter_list.head
 		    && check_filter(&server_filter_list, fname, 0) < 0) {
 			rprintf(FERROR, "attempt to hack rsync failed.\n");
 			exit_cleanup(RERR_PROTOCOL);
 		}
 
-		if (verbose > 2)
-			rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
-
 		if (dry_run) { /* log the transfer */
 			if (!am_server && log_format)
 				log_recv(file, &stats, iflags);
@@ -586,7 +596,14 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 
 		cleanup_disable();
 
-		if (!recv_ok) {
+		if (recv_ok) {
+			if (delay_updates && delayed_bits[i/8] & (1 << (i % 8)))
+				;
+			else if (remove_sent_files) {
+				SIVAL(numbuf, 0, i);
+				send_msg(MSG_SUCCESS, numbuf, 4);
+			}
+		} else {
 			int msgtype = csum_length == SUM_LENGTH || read_batch ?
 				FERROR : FINFO;
 			if (msgtype == FERROR || verbose) {
@@ -610,9 +627,8 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 					keptstr, redostr);
 			}
 			if (csum_length != SUM_LENGTH) {
-				char buf[4];
-				SIVAL(buf, 0, i);
-				send_msg(MSG_REDO, buf, 4);
+				SIVAL(numbuf, 0, i);
+				send_msg(MSG_REDO, numbuf, 4);
 			}
 		}
 	}
@@ -640,6 +656,10 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 						full_fname(fname),
 						safe_fname(partialptr));
 				} else {
+					if (remove_sent_files) {
+						SIVAL(numbuf, 0, i);
+						send_msg(MSG_SUCCESS,numbuf,4);
+					}
 					handle_partial_dir(partialptr,
 							   PDIR_DELETE);
 				}