X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/acee1ad8535ae59bda9585b422efe54b68e1f234..8ef246e0b5a3aa9944dab4275353c50aab9f955c:/sender.c

diff --git a/sender.c b/sender.c
index 6fcaa65d..3808cda8 100644
--- a/sender.c
+++ b/sender.c
@@ -128,9 +128,9 @@ void successful_send(int ndx)
 		return;
 
 	file = the_file_list->files[ndx];
-	if (file->dir.root) {
+	if (F_ROOTDIR(file)) {
 		offset = stringjoin(fname, sizeof fname,
-				    file->dir.root, "/", NULL);
+				    F_ROOTDIR(file), "/", NULL);
 	} else
 		offset = 0;
 	f_name(file, fname + offset);
@@ -143,8 +143,8 @@ void successful_send(int ndx)
 	}
 }
 
-static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
-				uchar fnamecmp_type, char *buf, int len)
+void write_ndx_and_attrs(int f_out, int ndx, int iflags,
+			 uchar fnamecmp_type, char *buf, int len)
 {
 	write_int(f_out, ndx);
 	if (protocol_version < 29)
@@ -156,56 +156,6 @@ static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
 		write_vstring(f_out, buf, len);
 }
 
-/* This is also used by receive.c with f_out = -1. */
-int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
-		    char *buf, int *len_ptr)
-{
-	int len;
-	uchar fnamecmp_type = FNAMECMP_FNAME;
-	int iflags = protocol_version >= 29 ? read_shortint(f_in)
-		   : ITEM_TRANSFER | ITEM_MISSING_DATA;
-
-	/* Handle the new keep-alive (no-op) packet. */
-	if (ndx == the_file_list->count && iflags == ITEM_IS_NEW)
-		;
-	else if (ndx < 0 || ndx >= the_file_list->count) {
-		rprintf(FERROR, "Invalid file index: %d (count=%d) [%s]\n",
-			ndx, the_file_list->count, who_am_i());
-		exit_cleanup(RERR_PROTOCOL);
-	} else if (iflags == ITEM_IS_NEW) {
-		rprintf(FERROR, "Invalid itemized flag word: %x [%s]\n",
-			iflags, who_am_i());
-		exit_cleanup(RERR_PROTOCOL);
-	}
-
-	if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
-		fnamecmp_type = read_byte(f_in);
-	*type_ptr = fnamecmp_type;
-
-	if (iflags & ITEM_XNAME_FOLLOWS) {
-		if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
-			exit_cleanup(RERR_PROTOCOL);
-	} else {
-		*buf = '\0';
-		len = -1;
-	}
-	*len_ptr = len;
-
-	if (iflags & ITEM_TRANSFER) {
-		if (!S_ISREG(the_file_list->files[ndx]->mode)) {
-			rprintf(FERROR,
-				"received request to transfer non-regular file: %d [%s]\n",
-				ndx, who_am_i());
-			exit_cleanup(RERR_PROTOCOL);
-		}
-	} else if (f_out >= 0) {
-		write_ndx_and_attrs(f_out, ndx, iflags,
-				    fnamecmp_type, buf, len);
-	}
-
-	return iflags;
-}
-
 void send_files(struct file_list *flist, int f_out, int f_in)
 {
 	int fd = -1;
@@ -232,13 +182,13 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		unsigned int offset;
 
 		i = read_int(f_in);
-		if (i == -1) {
+		if (i == NDX_DONE) {
 			if (++phase > max_phase)
 				break;
 			csum_length = SUM_LENGTH;
 			if (verbose > 2)
 				rprintf(FINFO, "send_files phase=%d\n", phase);
-			write_int(f_out, -1);
+			write_int(f_out, NDX_DONE);
 			/* For inplace: redo phase turns off the backup
 			 * flag so that we do a regular inplace send. */
 			make_backups = 0;
@@ -252,9 +202,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 			continue;
 
 		file = flist->files[i];
-		if (file->dir.root) {
+		if (F_ROOTDIR(file)) {
 			/* N.B. We're sure that this fits, so offset is OK. */
-			offset = strlcpy(fname, file->dir.root, sizeof fname);
+			offset = strlcpy(fname, F_ROOTDIR(file), sizeof fname);
 			if (!offset || fname[offset-1] != '/')
 				fname[offset++] = '/';
 		} else
@@ -280,7 +230,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
 		stats.current_file_index = i;
 		stats.num_transferred_files++;
-		stats.total_transferred_size += file->length;
+		stats.total_transferred_size += F_LENGTH(file);
 
 		if (!do_xfers) { /* log the transfer */
 			log_item(FCLIENT, file, &stats, iflags, NULL);
@@ -382,5 +332,5 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
 	match_report();
 
-	write_int(f_out, -1);
+	write_int(f_out, NDX_DONE);
 }