X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e6e3f12ffc8b5a77b18af9498a045a43a7d58928..6a7cc46cb279b9dbf12977177330aeebb912aa34:/sender.c

diff --git a/sender.c b/sender.c
index 841e81fa..3d390526 100644
--- a/sender.c
+++ b/sender.c
@@ -38,16 +38,14 @@ extern int am_server;
 
 void read_sum_head(int f, struct sum_struct *sum)
 {
-	extern int remote_version;
+	extern int protocol_version;
 
 	sum->count = read_int(f);
 	sum->blength = read_int(f);
-	if (remote_version < 27)
-	{
+	if (protocol_version < 27)
 		sum->s2length = csum_length;
-	} else {
+	else
 		sum->s2length = read_int(f);
-	}
 	sum->remainder = read_int(f);
 }
 
@@ -160,7 +158,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 			if (strlen(fname) == MAXPATHLEN-1) {
 				io_error = 1;
 				rprintf(FERROR, "send_files failed on long-named directory %s\n",
-					fname);
+					full_fname(fname));
 				return;
 			}
 			strlcat(fname, "/", MAXPATHLEN);
@@ -196,7 +194,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 			if (fd == -1) {
 				io_error = 1;
 				rprintf(FERROR, "send_files failed to open %s: %s\n",
-					fname, strerror(errno));
+					full_fname(fname), strerror(errno));
 				free_sums(s);
 				continue;
 			}
@@ -204,7 +202,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 			/* map the local file */
 			if (do_fstat(fd, &st) != 0) {
 				io_error = 1;
-				rprintf(FERROR, "fstat failed : %s\n", strerror(errno));
+				rprintf(FERROR, "fstat failed: %s\n", strerror(errno));
 				free_sums(s);
 				close(fd);
 				return;
@@ -279,7 +277,17 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		}
 
 		if (!read_batch) { /* dw */
-			if (buf) unmap_file(buf);
+			if (buf) {
+				j = unmap_file(buf);
+				if (j) {
+					io_error = 1;
+					rprintf(FERROR,
+					    "read errors mapping %s: (%d) %s\n",
+					    full_fname(fname),
+					    j,
+					    strerror(j));
+				}
+			}
 			close(fd);
 		}