From eb9b2e53c8d966f356454f1ba70ea5901674fedf Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Thu, 3 Feb 2005 19:19:39 +0000 Subject: [PATCH] Changed delete_missing() to not limit the use of DEL_FORCE_RECURSE to just --delete-during now that the other delete routines are using delete_in_dir(). --- flist.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/flist.c b/flist.c index e85b5101..2ded8e6e 100644 --- a/flist.c +++ b/flist.c @@ -1746,13 +1746,10 @@ void delete_missing(struct file_list *full_list, struct file_list *dir_list, rprintf(FINFO, "deleting %s\n", safe_fname(f)); } - } else if (S_ISDIR(mode)) { - int dflag = delete_during ? DEL_FORCE_RECURSE - : DEL_NO_RECURSE; - delete_file(f, DEL_DIR | dflag); - } else { + } else if (S_ISDIR(mode)) + delete_file(f, DEL_DIR | DEL_FORCE_RECURSE); + else delete_file(f, 0); - } deletion_count++; if (max_delete && deletion_count >= max_delete) break; -- 2.34.1