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;
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);
}
io_start_buffering_in();
if (delete_mode && !delete_excluded)
- recv_exclude_list(f_in);
+ recv_filter_list(f_in);
+ if (cvs_exclude)
+ add_cvs_excludes();
if (filesfrom_fd >= 0) {
/* We need to send the files-from names to the sender at the
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);
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;
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);