X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/46e99b09b980f3d67dc3f92f07b27db754981662..669e76717c64bf40a8626da779839420cbf4a068:/receiver.c

diff --git a/receiver.c b/receiver.c
index 656f2a25..4c117597 100644
--- a/receiver.c
+++ b/receiver.c
@@ -386,15 +386,9 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 			continue;
 		}
 
-		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)
-				continue;
-			rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n",
-				i, flist->count);
-			exit_cleanup(RERR_PROTOCOL);
-		}
+		iflags = read_iflags(f_in, -1, i, fnametmp);
+		if (iflags == ITEM_IS_NEW) /* no-op packet */
+			continue;
 
 		file = flist->files[i];
 		fname = local_name ? local_name : f_name_to(file, fbuf);
@@ -402,21 +396,10 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 		if (verbose > 2)
 			rprintf(FINFO, "recv_files(%s)\n", safe_fname(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);
-				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;
-			}
-		} else
-			iflags = ITEM_UPDATING | ITEM_MISSING_DATA;
+		if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
+			maybe_log_item(file, iflags, itemizing, fnametmp);
+			continue;
+		}
 
 		if (!S_ISREG(file->mode)) {
 			rprintf(FERROR, "[%s] got index of non-regular file: %d\n",
@@ -437,7 +420,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 
 		if (dry_run) { /* log the transfer */
 			if (!am_server && log_format)
-				log_recv(file, &stats, iflags);
+				log_item(file, &stats, iflags, NULL);
 			continue;
 		}
 
@@ -581,7 +564,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 
 		/* log the transfer */
 		if (log_before_transfer)
-			log_recv(file, &initial_stats, iflags);
+			log_item(file, &initial_stats, iflags, NULL);
 		else if (!am_server && verbose && do_progress)
 			rprintf(FINFO, "%s\n", safe_fname(fname));
 
@@ -590,7 +573,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 				       fname, fd2, file->length);
 
 		if (!log_before_transfer)
-			log_recv(file, &initial_stats, iflags);
+			log_item(file, &initial_stats, iflags, NULL);
 
 		if (fd1 != -1)
 			close(fd1);