file->mode = save_mode;
}
- if (!S_ISDIR(st.st_mode))
+ if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))
stats.total_size += st.st_size;
return file;
send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirbuf, dlen);
recurse = save_recurse;
+ clean_flist(dirlist, 0, 0);
+
return dirlist;
}
struct file_list *dirlist;
char buf[MAXPATHLEN];
int j, zap_dir, ok;
+ void *save_filters;
if (max_delete && deletion_count >= max_delete)
return -1;
zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse))
&& !(flags & DEL_NO_RECURSE);
- if (dry_run && zap_dir)
+ if (dry_run && zap_dir) {
+ ok = 0;
errno = ENOTEMPTY;
- else if (do_rmdir(fname) == 0) {
+ } else if (make_backups && !backup_dir && !is_backup_file(fname)
+ && !(flags & DEL_FORCE_RECURSE))
+ ok = make_backup(fname);
+ else
+ ok = do_rmdir(fname) == 0;
+ if (ok) {
if ((verbose || log_format) && !(flags & DEL_TERSE))
log_delete(fname, mode);
deletion_count++;
full_fname(fname));
return -1;
}
+ flags |= DEL_FORCE_RECURSE;
- if (!(flags & DEL_TERSE)) {
- if (verbose || log_format)
- log_delete(fname, mode);
- flags |= DEL_TERSE;
- }
+ save_filters = push_local_filters(fname, strlen(fname));
dirlist = get_dirlist(fname, 0);
- for (j = 0; j < dirlist->count; j++) {
+ for (j = dirlist->count; j--; ) {
struct file_struct *fp = dirlist->files[j];
f_name_to(fp, buf);
- if (verbose || log_format)
- log_delete(buf, fp->mode);
- if (delete_file(buf, fp->mode, flags) != 0) {
+ if (delete_file(buf, fp->mode, flags & ~DEL_TERSE) != 0) {
flist_free(dirlist);
return -1;
}
}
flist_free(dirlist);
+ pop_local_filters(save_filters);
+
if (max_delete && deletion_count >= max_delete)
return -1;
- if (make_backups && !backup_dir && !is_backup_file(fname))
- ok = make_backup(fname);
- else
- ok = do_rmdir(fname) == 0;
- if (!ok && errno != ENOENT) {
+ if (do_rmdir(fname) == 0) {
+ if ((verbose || log_format) && !(flags & DEL_TERSE))
+ log_delete(fname, mode);
+ deletion_count++;
+ } else if (errno != ENOTEMPTY && errno != ENOENT) {
rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
full_fname(fname));
return -1;
}
- deletion_count++;
return 0;
}
if (flist_find(full_list, dir_list->files[i]) < 0) {
char *fn = f_name_to(dir_list->files[i], fbuf);
int mode = dir_list->files[i]->mode;
- int dflag = S_ISDIR(mode) ? DEL_FORCE_RECURSE : 0;
- if (delete_file(fn, mode, dflag) < 0)
+ if (delete_file(fn, mode, DEL_FORCE_RECURSE) < 0)
break;
}
}
recurse = -1;
fbuf[dlen] = '\0';
+ clean_flist(dir_list, 0, 0);
+
if (verbose > 3)
output_flist(dir_list, "delete");