X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/46e6ad492a87595d271279e7dda5df4f8be9e730..93689aa51a1541cbc53bd9fa261b9c01ce0d0a95:/main.c

diff --git a/main.c b/main.c
index 4052ea98..fa5ecc03 100644
--- a/main.c
+++ b/main.c
@@ -207,10 +207,11 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
 
 		args[argc++] = rsync_path;
 
-		server_options(args,&argc);
+		if ((blocking_io == -1) && (strcmp(cmd, RSYNC_RSH) == 0))
+			blocking_io = 1;
 
+		server_options(args,&argc);
 
-		if (strcmp(cmd, RSYNC_RSH) == 0) blocking_io = 1;
 	}
 
 	args[argc++] = ".";
@@ -711,7 +712,8 @@ static int start_client(int argc, char *argv[])
 		if (!p) {
 			local_server = 1;
 			/* disable "rsync algorithm" when both sides local */
-			whole_file = 1;
+			if (whole_file == -1)
+				whole_file = 1;
 		} else if (p[1] == ':') {
 			*p = 0;
 			return start_socket_client(argv[argc-1], p+2, argc-1, argv);