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

diff --git a/main.c b/main.c
index be8ae39f..b45a9806 100644
--- a/main.c
+++ b/main.c
@@ -45,7 +45,6 @@ extern int log_got_error;
 extern int module_id;
 extern int orig_umask;
 extern int copy_links;
-extern int keep_dirs;
 extern int keep_dirlinks;
 extern int preserve_hard_links;
 extern int protocol_version;
@@ -477,7 +476,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
 	if (delete_before) {
 		/* I moved this here from recv_files() to prevent a race condition */
-		if (keep_dirs && !local_name && flist->count > 0)
+		if (recurse && !local_name && flist->count > 0)
 			delete_files(flist);
 	}
 
@@ -597,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
@@ -651,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);
@@ -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;
 
@@ -736,7 +735,9 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 		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);