In delete_files(), handle new DEL_NO_RECURSE flag (and use

renamed DEL_FORCE_RECURSE flag.
This commit is contained in:
Wayne Davison
2005-01-25 12:07:13 +00:00
parent 217cc3b045
commit 4366d2c428

View File

@@ -76,7 +76,8 @@ int delete_file(char *fname, int flags)
return -1;
}
zap_dir = flags & DEL_RECURSE || (force_delete && recurse);
zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse))
&& !(flags & DEL_NO_RECURSE);
if (dry_run && zap_dir)
errno = ENOTEMPTY;
else if (do_rmdir(fname) == 0) {