extern int safe_symlinks;
extern long block_size; /* "long" because popt can't set an int32. */
-extern struct exclude_list_struct server_exclude_list;
+extern struct filter_list_struct server_filter_list;
static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
{
if (verbose > 2)
rprintf(FINFO, "recv_generator(%s,%d)\n", safe_fname(fname), i);
- if (server_exclude_list.head
- && check_exclude(&server_exclude_list, fname,
- S_ISDIR(file->mode)) < 0) {
+ if (server_filter_list.head
+ && check_filter(&server_filter_list, fname,
+ S_ISDIR(file->mode)) < 0) {
if (verbose) {
rprintf(FINFO, "skipping server-excluded file \"%s\"\n",
safe_fname(fname));
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && f_out != -1)
rprintf(FINFO, "%s/\n", safe_fname(fname));
- if (delete_during && f_out != -1
+ if (delete_during && f_out != -1 && csum_length != SUM_LENGTH
&& (file->flags & FLAG_DEL_START))
delete_in_dir(flist, fname);
return;
close(fd);
return;
}
- if (!(back_file = make_file(fname, NULL, NO_EXCLUDES))) {
+ if (!(back_file = make_file(fname, NULL, NO_FILTERS))) {
close(fd);
goto pretend_missing;
}
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
flist, file, i, f_out, f_out_name);
}
+ if (delete_during)
+ delete_in_dir(NULL, NULL);
phase++;
csum_length = SUM_LENGTH;