+ deleting = 0;
+ return ret;
+}
---- orig/generator.c 2005-02-27 18:24:42
-+++ generator.c 2005-02-26 19:31:06
-@@ -82,16 +82,23 @@ extern dev_t filesystem_dev;
+--- orig/generator.c 2005-03-05 00:25:24
++++ generator.c 2005-03-05 00:26:54
+@@ -83,6 +83,9 @@ extern dev_t filesystem_dev;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
+extern char *backup_dir_dels;
+extern char *backup_suffix_dels;
+extern int backup_suffix_dels_len;
-
+ extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
+@@ -91,10 +94,14 @@ int allowed_lull = 0;
static int deletion_count = 0; /* used to implement --max-delete */
-+/* Function now checks if file matches backup- or delete-suffix patterns. */
++/* Function now compares both backup_suffix and backup_suffix_dels. */
static int is_backup_file(char *fn)
{
int k = strlen(fn) - backup_suffix_len;
}
-@@ -109,8 +116,8 @@ static int delete_item(char *fname, int
+@@ -112,8 +119,8 @@ static int delete_item(char *fname, int
return -1;
if (!S_ISDIR(mode)) {
else
ok = robust_unlink(fname) == 0;
if (ok) {
-@@ -131,9 +138,9 @@ static int delete_item(char *fname, int
+@@ -134,9 +141,9 @@ static int delete_item(char *fname, int
if (dry_run && zap_dir) {
ok = 0;
errno = ENOTEMPTY;
else
ok = do_rmdir(fname) == 0;
if (ok) {
---- orig/options.c 2005-03-01 01:22:59
+--- orig/options.c 2005-03-02 09:52:06
+++ options.c 2005-03-01 01:25:39
@@ -127,10 +127,14 @@ int no_detach
int write_batch = 0;