X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b951e023ec1c81ec1ad4d6f6f3508bf3e19165e8..a8ed49583304181a0516ce98014ae7389ec4c160:/sender.c

diff --git a/sender.c b/sender.c
index 10ea2fa9..a3cdff40 100644
--- a/sender.c
+++ b/sender.c
@@ -20,6 +20,7 @@
 #include "rsync.h"
 
 extern int verbose;
+extern int what_has_changed;
 extern int csum_length;
 extern struct stats stats;
 extern int io_error;
@@ -47,7 +48,7 @@ extern struct stats stats;
 static struct sum_struct *receive_sums(int f)
 {
 	struct sum_struct *s;
-	int i;
+	int32 i;
 	OFF_T offset = 0;
 
 	if (!(s = new(struct sum_struct)))
@@ -68,14 +69,14 @@ static struct sum_struct *receive_sums(int f)
 	if (!(s->sums = new_array(struct sum_buf, s->count)))
 		out_of_memory("receive_sums");
 
-	for (i = 0; i < (int)s->count; i++) {
+	for (i = 0; i < s->count; i++) {
 		s->sums[i].sum1 = read_int(f);
 		read_buf(f, s->sums[i].sum2, s->s2length);
 
 		s->sums[i].offset = offset;
 		s->sums[i].flags = 0;
 
-		if (i == (int)s->count-1 && s->remainder != 0)
+		if (i == s->count-1 && s->remainder != 0)
 			s->sums[i].len = s->remainder;
 		else
 			s->sums[i].len = s->blength;
@@ -145,14 +146,19 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 			updating_basis_file = inplace && !make_backups;
 
 		file = flist->files[i];
+		if (S_ISDIR(file->mode)) {
+			rprintf(FERROR, "[%s] got index of directory: %d\n",
+				who_am_i(), i);
+			exit_cleanup(RERR_PROTOCOL);
+		}
 
 		stats.current_file_index = i;
 		stats.num_transferred_files++;
 		stats.total_transferred_size += file->length;
 
-		if (file->basedir) {
+		if (file->dir.root) {
 			/* N.B. We're sure that this fits, so offset is OK. */
-			offset = strlcpy(fname, file->basedir, sizeof fname);
+			offset = strlcpy(fname, file->dir.root, sizeof fname);
 			if (!offset || fname[offset-1] != '/')
 				fname[offset++] = '/';
 		} else
@@ -162,8 +168,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		if (verbose > 2)
 			rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
 
-		if (dry_run) {
-			if (!am_server && verbose) /* log the transfer */
+		if (dry_run) { /* log the transfer */
+			if (!am_server && verbose && !what_has_changed)
 				rprintf(FINFO, "%s\n", safe_fname(fname2));
 			write_int(f_out, i);
 			continue;
@@ -224,7 +230,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 				safe_fname(fname));
 		}
 
-		if (!am_server && verbose) /* log the transfer */
+		/* log the transfer */
+		if (!am_server && verbose && !what_has_changed)
 			rprintf(FINFO, "%s\n", safe_fname(fname2));
 
 		set_compression(fname);