- The call to delete_file() needs DEL_NO_RECURSE when handling
authorWayne Davison <wayned@samba.org>
Tue, 25 Jan 2005 12:05:20 +0000 (12:05 +0000)
committerWayne Davison <wayned@samba.org>
Tue, 25 Jan 2005 12:05:20 +0000 (12:05 +0000)
  delete_before or delete_after or --dry-run will report too
  many deletions.
- Changed DEL_RECURSE to DEL_FORCE_RECURSE.

flist.c

diff --git a/flist.c b/flist.c
index ac57167..c513e5a 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -1724,8 +1724,10 @@ void delete_in_dir(struct file_list *flist, char *fname)
                                                safe_fname(f));
                                }
                        } else {
-                               delete_file(f, S_ISDIR(mode)
-                                               ? DEL_DIR | DEL_RECURSE : 0);
+                               int dflags = delete_during
+                                   ? DEL_DIR | DEL_FORCE_RECURSE
+                                   : DEL_DIR | DEL_NO_RECURSE;
+                               delete_file(f, S_ISDIR(mode) ? dflags : 0);
                        }
                        deletion_count++;
                }