X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/88b218fa5c296f5077ec09f52381b6cd6dc84e3a..e844be4e7bfb2c0d9ea583cb4d507217f14ffa4d:/receiver.c

diff --git a/receiver.c b/receiver.c
index e0dacd83..85086f65 100644
--- a/receiver.c
+++ b/receiver.c
@@ -22,6 +22,7 @@
 
 extern int verbose;
 extern int log_before_transfer;
+extern int itemize_changes;
 extern int delete_after;
 extern int csum_length;
 extern struct stats stats;
@@ -370,10 +371,14 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 		file = flist->files[i];
 
 		if (protocol_version >= 29) {
-			iflags = read_byte(f_in);
-			iflags |= read_byte(f_in) << 8;
+			iflags = read_short(f_in);
 			if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
-				if (!dry_run || !am_server)
+				if (am_server)
+					; /* do nothing */
+				else if (itemize_changes
+				    || iflags & ITEM_UPDATING
+				    || (S_ISDIR(file->mode)
+				     && iflags & ITEM_REPORT_TIME))
 					log_recv(file, &stats, iflags);
 				continue;
 			}