X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c88ca682ef8ee2cfea99ce3a50e702166cbe2121..b52c1d9d3aec51afbc9d1c5561d2b70d8bcecf54:/flist.c

diff --git a/flist.c b/flist.c
index 27025df3..0cc57f2d 100644
--- a/flist.c
+++ b/flist.c
@@ -47,6 +47,9 @@ extern int remote_version;
 extern int io_error;
 extern int sanitize_paths;
 
+extern int read_batch;
+extern int write_batch;
+
 static char topsrcname[MAXPATHLEN];
 
 static struct exclude_struct **local_exclude_list;
@@ -149,7 +152,8 @@ int readlink_stat(const char *Path, STRUCT_STAT *Buffer, char *Linkbuf)
 		return -1;
 	}
 	if (S_ISLNK(Buffer->st_mode)) {
-		if (readlink((char *) Path, Linkbuf, MAXPATHLEN-1) == -1) {
+		int l;
+		if ((l = readlink((char *) Path, Linkbuf, MAXPATHLEN-1))== -1) {
 			return -1;
 		}
 		Linkbuf[l] = 0;
@@ -612,6 +616,9 @@ void send_file_name(int f,struct file_list *flist,char *fname,
 		  out_of_memory("send_file_name");
   }
 
+  if (write_batch) /*  dw  */
+    file->flags = FLAG_DELETE;
+
   if (strcmp(file->basename,"")) {
     flist->files[flist->count++] = file;
     send_file_entry(file,f,base_flags);
@@ -840,6 +847,8 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
 		io_end_buffering(f);
 		stats.flist_size = stats.total_written - start_write;
 		stats.num_files = flist->count;
+		if (write_batch) /*  dw  */
+		    write_batch_flist_info(flist->count, flist->files);
 	}
 
 	if (verbose > 2)
@@ -917,7 +926,7 @@ struct file_list *recv_file_list(int f)
   }
 
   /* if protocol version is >= 17 then recv the io_error flag */
-  if (f != -1 && remote_version >= 17) {
+  if (f != -1 && remote_version >= 17  && !read_batch) {  /* dw-added readbatch */
 	  extern int module_id;
 	  extern int ignore_errors;
 	  if (lp_ignore_errors(module_id) || ignore_errors) {
@@ -1095,10 +1104,10 @@ static void clean_flist(struct file_list *flist, int strip_root)
 
 	for (i=0;i<flist->count;i++) {
 		rprintf(FINFO,"[%d] i=%d %s %s mode=0%o len=%.0f\n",
-			getpid(), i, 
+			(int) getpid(), i, 
 			NS(flist->files[i]->dirname),
 			NS(flist->files[i]->basename),
-			flist->files[i]->mode,
+			(int) flist->files[i]->mode,
 			(double)flist->files[i]->length);
 	}
 }