From e35d9f2d6d5f1cb1f87736748d5249ce18b10da0 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 30 Jan 2006 18:45:57 +0000 Subject: [PATCH] I realized that there were instances where --force could still be required to be combined with a delete option (if a non-dir was overwriting a dir in a directory that was not included in the transfer), so I extended the change I just made for --delete-after to include all delete modes. --- generator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/generator.c b/generator.c index 97395a7d..44a097d4 100644 --- a/generator.c +++ b/generator.c @@ -45,6 +45,7 @@ extern int preserve_uid; extern int preserve_gid; extern int preserve_times; extern int omit_dir_times; +extern int delete_mode; extern int delete_before; extern int delete_during; extern int delete_after; @@ -780,7 +781,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, char *fnamecmp, *partialptr, *backupptr = NULL; char fnamecmpbuf[MAXPATHLEN]; uchar fnamecmp_type; - int del_opts = DEL_TERSE | (delete_after ? DEL_FORCE_RECURSE : 0); + int del_opts = DEL_TERSE | (delete_mode ? DEL_FORCE_RECURSE : 0); if (list_only) return; -- 2.34.1