X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/76cb2a3a4f2708c07e6ac81a23b2d39aad419bbe..7842418b7b87c4c78ad8ad06fec44150c8aa0956:/main.c

diff --git a/main.c b/main.c
index 4c088415..b45a9806 100644
--- a/main.c
+++ b/main.c
@@ -33,8 +33,9 @@ extern int verbose;
 extern int blocking_io;
 extern int cvs_exclude;
 extern int delete_mode;
-extern int delete_excluded;
+extern int delete_before;
 extern int delete_after;
+extern int delete_excluded;
 extern int daemon_over_rsh;
 extern int do_stats;
 extern int dry_run;
@@ -59,6 +60,7 @@ extern int filesfrom_fd;
 extern pid_t cleanup_child_pid;
 extern char *files_from;
 extern char *remote_filesfrom_file;
+extern char *partial_dir;
 extern char *basis_dir[];
 extern char *rsync_path;
 extern char *shell_cmd;
@@ -432,7 +434,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 			argv[i] += l+1;
 	}
 
-	if (argc == 0 && recurse) {
+	if (argc == 0 && (recurse || list_only)) {
 		argc = 1;
 		argv--;
 		argv[0] = ".";
@@ -463,7 +465,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 	int pid;
 	int status = 0;
 	int error_pipe[2], name_pipe[2];
-	BOOL need_name_pipe = basis_dir[0] && !dry_run;
+	BOOL need_name_pipe = (basis_dir[0] || partial_dir) && !dry_run;
 
 	/* The receiving side mustn't obey this, or an existing symlink that
 	 * points to an identical file won't be replaced by the referent. */
@@ -472,9 +474,9 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 	if (preserve_hard_links)
 		init_hard_links(flist);
 
-	if (!delete_after) {
+	if (delete_before) {
 		/* I moved this here from recv_files() to prevent a race condition */
-		if (recurse && delete_mode && !local_name && flist->count > 0)
+		if (recurse && !local_name && flist->count > 0)
 			delete_files(flist);
 	}
 
@@ -540,7 +542,6 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
 	generate_files(f_out, flist, local_name, name_pipe[1]);
 
-	get_redo_num(); /* Read final MSG_DONE and any prior messages. */
 	report(-1);
 	io_flush(FULL_FLUSH);
 	if (protocol_version >= 24) {
@@ -595,7 +596,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 
 	io_start_buffering_in();
 	if (delete_mode && !delete_excluded)
-		recv_exclude_list(f_in);
+		recv_filter_list(f_in);
 
 	if (filesfrom_fd >= 0) {
 		/* We need to send the files-from names to the sender at the
@@ -649,7 +650,7 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
 	if (am_sender) {
 		keep_dirlinks = 0; /* Must be disabled on the sender. */
 
-		recv_exclude_list(f_in);
+		recv_filter_list(f_in);
 		if (cvs_exclude)
 			add_cvs_excludes();
 		do_server_sender(f_in, f_out, argc, argv);
@@ -671,9 +672,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 	char *local_name = NULL;
 
 	cleanup_child_pid = pid;
-	if (read_batch) {
-		assert(am_sender == 0);
-	} else {
+	if (!read_batch) {
 		set_nonblocking(f_in);
 		set_nonblocking(f_out);
 	}
@@ -702,7 +701,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 		if (cvs_exclude)
 			add_cvs_excludes();
 		if (delete_mode && !delete_excluded)
-			send_exclude_list(f_out);
+			send_filter_list(f_out);
 		if (remote_filesfrom_file)
 			filesfrom_fd = f_in;
 
@@ -733,10 +732,12 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 	}
 
 	if (argc == 0)
-		list_only = 1;
+		list_only |= 1;
 
 	if (!read_batch)
-		send_exclude_list(f_out);
+		send_filter_list(f_out);
+	if (cvs_exclude)
+		add_cvs_excludes();
 
 	if (filesfrom_fd >= 0) {
 		io_set_filesfrom_fds(filesfrom_fd, f_out);
@@ -829,8 +830,7 @@ static int start_client(int argc, char *argv[])
 		if (p) {
 			rsync_port = atoi(p+1);
 			*p = '\0';
-		} else
-			rsync_port = RSYNC_PORT;
+		}
 		return start_socket_client(host, path, argc-1, argv+1);
 	}
 
@@ -888,8 +888,7 @@ static int start_client(int argc, char *argv[])
 				if (p) {
 					rsync_port = atoi(p+1);
 					*p = '\0';
-				} else
-					rsync_port = RSYNC_PORT;
+				}
 				return start_socket_client(host, path, argc-1, argv);
 			}
 
@@ -966,9 +965,8 @@ static int start_client(int argc, char *argv[])
 	}
 
 	/* ... or no dest at all */
-	if (!am_sender && argc == 0) {
-		list_only = 1;
-	}
+	if (!am_sender && argc == 0)
+		list_only |= 1;
 
 	pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,
 		     &f_in,&f_out);