Changed delete_missing() to not limit the use of DEL_FORCE_RECURSE
authorWayne Davison <wayned@samba.org>
Thu, 3 Feb 2005 19:19:39 +0000 (19:19 +0000)
committerWayne Davison <wayned@samba.org>
Thu, 3 Feb 2005 19:19:39 +0000 (19:19 +0000)
to just --delete-during now that the other delete routines are using
delete_in_dir().

flist.c

diff --git a/flist.c b/flist.c
index e85b5101551ec69c5b553b15cbc0a1918027e4ff..2ded8e6e8466d067e2d3a6f6b008aa57208cb1be 100644 (file)
--- 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;