summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
d97fd43)
DEL_RECURSE code. Improved the verbose output of a recursively
deleted directory when --dry-run is specified.
struct dirent *di;
char buf[MAXPATHLEN];
STRUCT_STAT st;
struct dirent *di;
char buf[MAXPATHLEN];
STRUCT_STAT st;
if (!(flags & DEL_DIR)) {
if (robust_unlink(fname) == 0) {
if (!(flags & DEL_DIR)) {
if (robust_unlink(fname) == 0) {
- if (do_rmdir(fname) == 0) {
+ zap_dir = flags & DEL_RECURSE || (force_delete && recurse);
+ if (dry_run && zap_dir)
+ errno = ENOTEMPTY;
+ else if (do_rmdir(fname) == 0) {
if (verbose && !(flags & DEL_TERSE)) {
rprintf(FINFO, "deleting %s/\n",
safe_fname(fname));
if (verbose && !(flags & DEL_TERSE)) {
rprintf(FINFO, "deleting %s/\n",
safe_fname(fname));
}
if (errno == ENOENT)
return 0;
}
if (errno == ENOENT)
return 0;
- if ((flags & DEL_NO_RECURSE) || !force_delete || !recurse
- || (errno != ENOTEMPTY && errno != EEXIST)) {
+ if (!zap_dir || (errno != ENOTEMPTY && errno != EEXIST)) {
rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
full_fname(fname));
return -1;
rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
full_fname(fname));
return -1;