X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/66a9dc9639db9b86dd7218beda5ba1637651462d..9eeb3b9c88d62bac0fed650fdbc310d5958cc541:/main.c

diff --git a/main.c b/main.c
index d609ea58..0c355362 100644
--- a/main.c
+++ b/main.c
@@ -53,6 +53,7 @@ extern int whole_file;
 extern int read_batch;
 extern int write_batch;
 extern int batch_fd;
+extern int batch_gen_fd;
 extern int filesfrom_fd;
 extern pid_t cleanup_child_pid;
 extern char *files_from;
@@ -150,6 +151,8 @@ static void report(int f)
 	/* this is the client */
 
 	if (!am_sender) {
+		/* Read the first two in opposite order because the meaning of
+		 * read/write swaps when switching from sender to receiver. */
 		total_written = read_longint(f);
 		total_read = read_longint(f);
 		stats.total_size = read_longint(f);
@@ -311,15 +314,24 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
 		rprintf(FINFO,"\n");
 	}
 
-	if (local_server) {
+	if (read_batch) {
+		int from_gen_pipe[2];
+		if (fd_pair(from_gen_pipe) < 0) {
+			rsyserr(FERROR, errno, "pipe");
+			exit_cleanup(RERR_IPC);
+		}
+		batch_gen_fd = from_gen_pipe[0];
+		*f_out = from_gen_pipe[1];
+		*f_in = batch_fd;
+		ret = -1; /* no child pid */
+	} else if (local_server) {
 		/* If the user didn't request --[no-]whole-file, force
 		 * it on, but only if we're not batch processing. */
-		if (whole_file < 0 && !read_batch && !write_batch)
+		if (whole_file < 0 && !write_batch)
 			whole_file = 1;
 		ret = local_child(argc, args, f_in, f_out, child_main);
-	} else {
+	} else
 		ret = piped_child(args,f_in,f_out);
-	}
 
 	if (dir)
 		free(dir);
@@ -392,7 +404,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 			(long)getpid());
 	}
 
-	if (am_daemon && lp_write_only(module_id) && am_sender) {
+	if (am_daemon && lp_write_only(module_id)) {
 		rprintf(FERROR, "ERROR: module is write only\n");
 		exit_cleanup(RERR_SYNTAX);
 		return;
@@ -451,9 +463,8 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
 	if (!delete_after) {
 		/* I moved this here from recv_files() to prevent a race condition */
-		if (recurse && delete_mode && !local_name && flist->count>0) {
+		if (recurse && delete_mode && !local_name && flist->count > 0)
 			delete_files(flist);
-		}
 	}
 
 	if (fd_pair(error_pipe) < 0) {
@@ -469,7 +480,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 			close(f_out);
 
 		/* we can't let two processes write to the socket at one time */
-		io_multiplexing_close();
+		close_multiplexing_out();
 
 		/* set place to send errors */
 		set_msg_fd_out(error_pipe[1]);
@@ -488,6 +499,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 	}
 
 	am_generator = 1;
+	close_multiplexing_in();
 	if (write_batch)
 		stop_write_batch();
 
@@ -529,7 +541,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 			argc, (long)getpid());
 	}
 
-	if (am_daemon && lp_read_only(module_id) && !am_sender) {
+	if (am_daemon && lp_read_only(module_id)) {
 		rprintf(FERROR,"ERROR: module is read only\n");
 		exit_cleanup(RERR_SYNTAX);
 		return;
@@ -624,13 +636,6 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 
 	cleanup_child_pid = pid;
 	if (read_batch) {
-		/* This is the heart of the read_batch approach:
-		 * Switcher-roo the file descriptors, and
-		 * nobody's the wiser. */
-		close(f_in);
-		close(f_out);
-		f_in = batch_fd;
-		f_out = do_open("/dev/null", O_WRONLY, 0);
 		assert(am_sender == 0);
 	} else {
 		set_nonblocking(f_in);
@@ -655,8 +660,6 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 
 		if (write_batch)
 			start_write_batch(f_out);
-		/* Can be unconditional, but this is theoretically
-		 * more efficent for read_batch case. */
 		if (!read_batch) /* don't write to pipe */
 			flist = send_file_list(f_out,argc,argv);
 		if (verbose > 3)
@@ -683,8 +686,6 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 	if (argc == 0)
 		list_only = 1;
 
-	/* Can be unconditional, but this is theoretically more
-	 * efficient for the read_batch case. */
 	if (!read_batch)
 		send_exclude_list(f_out);
 
@@ -1086,6 +1087,8 @@ int main(int argc,char *argv[])
 				batch_name);
 			exit_cleanup(RERR_FILEIO);
 		}
+		if (read_batch)
+			read_stream_flags(batch_fd);
 	}
 
 	if (am_daemon && !am_server)