X-Git-Url: http://git.samba.org/samba.git/?p=rsync-patches.git;a=blobdiff_plain;f=backup-dir-dels.diff;h=fa68ad586cd6179a6f8bdab97464b27b50d8dabf;hp=29936dcee719b5cc3d79136e0ef48c72f1d7526d;hb=c9e1d521995362bf802af4a30b55f7857f64a064;hpb=27a7053cbe08bdce668f7fe62e53b06fbb6d4cb9

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 29936dc..fa68ad5 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -1,8 +1,8 @@
 This patches creates two new command line options as follows:
-	--backup-dir-rm
-	--backup-suffix-rm=SUFFIX
+	--backup-dir-dels=DIR
+	--suffix-dels=SUFFIX
 
-The backup-dir-rm and backup-suffix-rm options give the ability to store
+The backup-dir-dels and suffix-dels options give the ability to store
 backup of removed files on the receiver in different directories or with
 different suffix than the backup of files that have been changed but that
 are still on the source drive.  Both commands can be combined.
@@ -13,295 +13,338 @@ suffix.
 
 Marc St-Onge
 
---- orig/backup.c	2005-02-07 20:41:56
-+++ backup.c	2004-09-22 02:36:06
-@@ -22,11 +22,17 @@
- 
- extern int verbose;
- extern int backup_suffix_len;
-+extern int backup_suffix_rm_len;
+To use this patch, run these commands for a successful build:
+
+    patch -p1 <patches/backup-dir-dels.diff
+    ./configure                                 (optional if already run)
+    make
+
+based-on: 3bd9f51917ed5718275c6132006be155239a0550
+diff --git a/backup.c b/backup.c
+--- a/backup.c
++++ b/backup.c
+@@ -29,25 +29,32 @@ extern int preserve_specials;
+ extern int preserve_links;
+ extern int safe_symlinks;
  extern int backup_dir_len;
-+extern int backup_dir_rm_len;
++extern int backup_dir_dels_len;
  extern unsigned int backup_dir_remainder;
-+extern unsigned int backup_dir_rm_remainder;
++extern unsigned int backup_dir_dels_remainder;
  extern char backup_dir_buf[MAXPATHLEN];
-+extern char backup_dir_rm_buf[MAXPATHLEN];
++extern char backup_dir_dels_buf[MAXPATHLEN];
  extern char *backup_suffix;
-+extern char *backup_suffix_rm;
++extern char *backup_suffix_dels;
  extern char *backup_dir;
-+extern char *backup_dir_rm;
- 
- extern int am_root;
- extern int preserve_devices;
-@@ -35,6 +41,8 @@ extern int preserve_hard_links;
- extern int orig_umask;
- extern int safe_symlinks;
- 
-+static int deleting;
++extern char *backup_dir_dels;
 +
- /* make a complete pathname for backup file */
- char *get_backup_name(char *fname)
- {
-@@ -52,10 +60,27 @@ char *get_backup_name(char *fname)
- 	return NULL;
- }
++static BOOL deleting;
  
-+static char *get_delete_name(char *fname)
-+{
-+	if (backup_dir_rm) {
-+		if (stringjoin(backup_dir_rm_buf + backup_dir_rm_len, backup_dir_rm_remainder,
-+			       fname, backup_suffix_rm, NULL) < backup_dir_rm_remainder)
-+			return backup_dir_rm_buf;
-+	} else {
-+		if (stringjoin(backup_dir_rm_buf, MAXPATHLEN,
-+			       fname, backup_suffix_rm, NULL) < MAXPATHLEN)
-+			return backup_dir_rm_buf;
-+	}
-+
-+	rprintf(FERROR, "delete filename too long\n");
-+	return NULL;
-+}
-+
- /* simple backup creates a backup with a suffix in the same directory */
- static int make_simple_backup(char *fname)
+ /* Returns -1 on error, 0 on missing dir, and 1 on present dir. */
+-static int validate_backup_dir(void)
++static int validate_backup_dir(const char *buf)
  {
--	char *fnamebak = get_backup_name(fname);
-+	char *fnamebak = deleting ? get_delete_name(fname)
-+				  : get_backup_name(fname);
+ 	STRUCT_STAT st;
  
- 	if (!fnamebak)
- 		return 0;
-@@ -83,7 +108,8 @@ path
- static int make_bak_dir(char *fullpath)
+-	if (do_lstat(backup_dir_buf, &st) < 0) {
++	if (do_lstat(buf, &st) < 0) {
+ 		if (errno == ENOENT)
+ 			return 0;
+-		rsyserr(FERROR, errno, "backup lstat %s failed", backup_dir_buf);
++		rsyserr(FERROR, errno, "backup lstat %s failed", buf);
+ 		return -1;
+ 	}
+ 	if (!S_ISDIR(st.st_mode)) {
+ 		int flags = get_del_for_flag(st.st_mode) | DEL_FOR_BACKUP | DEL_RECURSE;
+-		if (delete_item(backup_dir_buf, st.st_mode, flags) == 0)
++		if (delete_item(buf, st.st_mode, flags) == 0)
+ 			return 0;
+ 		return -1;
+ 	}
+@@ -58,20 +65,20 @@ static int validate_backup_dir(void)
+  * backup_dir_buf.  Any new directories (compared to the prior backup
+  * path) are ensured to exist as directories, replacing anything else
+  * that may be in the way (e.g. a symlink). */
+-static BOOL copy_valid_path(const char *fname)
++static BOOL copy_valid_path(const char *fname, char *buf, int prefix_len, unsigned int remainder, const char *suffix)
  {
- 	STRUCT_STAT st;
--	char *rel = fullpath + backup_dir_len;
-+	int dir_len = deleting ? backup_dir_rm_len : backup_dir_len;
-+	char *rel = fullpath + dir_len;
- 	char *end = rel + strlen(rel);
- 	char *p = end;
+ 	const char *f;
+ 	int val;
+ 	BOOL ret = True;
+ 	stat_x sx;
+-	char *b, *rel = backup_dir_buf + backup_dir_len, *name = rel;
++	char *b, *rel = buf + prefix_len, *name = rel;
  
-@@ -170,7 +196,8 @@ static int keep_backup(char *fname)
- 	if (!(file = make_file(fname, NULL, NO_FILTERS)))
- 		return 1; /* the file could have disappeared */
+ 	for (f = fname, b = rel; *f && *f == *b; f++, b++) {
+ 		if (*b == '/')
+ 			name = b + 1;
+ 	}
  
--	if (!(buf = get_backup_name(fname)))
-+	buf = deleting ? get_delete_name(fname) : get_backup_name(fname);
-+	if (!buf)
- 		return 0;
+-	if (stringjoin(rel, backup_dir_remainder, fname, backup_suffix, NULL) >= backup_dir_remainder) {
++	if (stringjoin(rel, remainder, fname, suffix, NULL) >= remainder) {
+ 		rprintf(FERROR, "backup filename too long\n");
+ 		*name = '\0';
+ 		return False;
+@@ -82,7 +89,7 @@ static BOOL copy_valid_path(const char *fname)
+ 			return True;
+ 		*b = '\0';
+ 
+-		val = validate_backup_dir();
++		val = validate_backup_dir(buf);
+ 		if (val == 0)
+ 			break;
+ 		if (val < 0) {
+@@ -98,9 +105,9 @@ static BOOL copy_valid_path(const char *fname)
+ 	for ( ; b; name = b + 1, b = strchr(name, '/')) {
+ 		*b = '\0';
+ 
+-		while (do_mkdir(backup_dir_buf, ACCESSPERMS) < 0) {
++		while (do_mkdir(buf, ACCESSPERMS) < 0) {
+ 			if (errno == EEXIST) {
+-				val = validate_backup_dir();
++				val = validate_backup_dir(buf);
+ 				if (val > 0)
+ 					break;
+ 				if (val == 0)
+@@ -134,7 +141,7 @@ static BOOL copy_valid_path(const char *fname)
+ 				free_xattr(&sx);
+ 			}
+ #endif
+-			set_file_attrs(backup_dir_buf, file, NULL, NULL, 0);
++			set_file_attrs(buf, file, NULL, NULL, 0);
+ 			unmake_file(file);
+ 		}
+ 
+@@ -156,16 +163,21 @@ static BOOL copy_valid_path(const char *fname)
+ /* Make a complete pathname for backup file and verify any new path elements. */
+ char *get_backup_name(const char *fname)
+ {
++	char *buf = deleting ? backup_dir_dels_buf : backup_dir_buf;
++	char *suffix = deleting ? backup_suffix_dels : backup_suffix;
++
+ 	if (backup_dir) {
++		int prefix_len = deleting ? backup_dir_dels_len : backup_dir_len;
++		unsigned int remainder = deleting ? backup_dir_dels_remainder : backup_dir_remainder;
+ 		/* copy fname into backup_dir_buf while validating the dirs. */
+-		if (copy_valid_path(fname))
+-			return backup_dir_buf;
++		if (copy_valid_path(fname, buf, prefix_len, remainder, suffix))
++			return buf;
+ 		/* copy_valid_path() has printed an error message. */
+ 		return NULL;
+ 	}
  
- 	/* Check to see if this is a device file, or link */
-@@ -263,3 +290,13 @@ int make_backup(char *fname)
- 		return keep_backup(fname);
- 	return make_simple_backup(fname);
+-	if (stringjoin(backup_dir_buf, MAXPATHLEN, fname, backup_suffix, NULL) < MAXPATHLEN)
+-		return backup_dir_buf;
++	if (stringjoin(backup_dir_buf, MAXPATHLEN, fname, suffix, NULL) < MAXPATHLEN)
++		return buf;
+ 
+ 	rprintf(FERROR, "backup filename too long\n");
+ 	return NULL;
+@@ -339,3 +351,13 @@ int make_backup(const char *fname, BOOL prefer_rename)
+ 		rprintf(FINFO, "backed up %s to %s\n", fname, buf);
+ 	return ret;
  }
 +
 +/* backup switch routine called only when backing-up removed file */
-+int safe_delete(char *fname)
++int safe_delete(const char *fname)
 +{
 +	int ret;
 +	deleting = 1;
-+	ret = make_backup(fname);
++	ret = make_backup(fname, True);
 +	deleting = 0;
 +	return ret;
 +}
---- orig/flist.c	2005-02-09 02:37:15
-+++ flist.c	2005-01-30 10:11:42
-@@ -46,6 +46,8 @@ extern char curr_dir[MAXPATHLEN];
- extern unsigned int curr_dir_len;
+diff --git a/delete.c b/delete.c
+--- a/delete.c
++++ b/delete.c
+@@ -28,16 +28,23 @@ extern int max_delete;
  extern char *backup_dir;
  extern char *backup_suffix;
-+extern char *backup_dir_rm;
-+extern char *backup_suffix_rm;
- extern int filesfrom_fd;
- 
- extern int one_file_system;
-@@ -60,6 +62,7 @@ extern int relative_paths;
- extern int implied_dirs;
- extern int make_backups;
  extern int backup_suffix_len;
-+extern int backup_suffix_rm_len;
- extern int copy_links;
- extern int copy_unsafe_links;
- extern int protocol_version;
-@@ -1664,10 +1667,14 @@ char *f_name(struct file_struct *f)
- }
++extern char *backup_dir_dels;
++extern char *backup_suffix_dels;
++extern int backup_suffix_dels_len;
+ extern struct stats stats;
  
+ int ignore_perishable = 0;
+ int non_perishable_cnt = 0;
+ int skipped_deletes = 0;
  
-+/* Function now checks if file matches backup or delete suffix patterns */
- static int is_backup_file(char *fn)
++/* Function now compares both backup_suffix and backup_suffix_dels. */
+ static inline int is_backup_file(char *fn)
  {
  	int k = strlen(fn) - backup_suffix_len;
 -	return k > 0 && strcmp(fn+k, backup_suffix) == 0;
 +	if (k > 0 && strcmp(fn+k, backup_suffix) == 0)
 +		return 1;
-+	k += backup_suffix_len - backup_suffix_rm_len;
-+	return k > 0 && strcmp(fn+k, backup_suffix_rm) == 0;
++	k += backup_suffix_len - backup_suffix_dels_len;
++	return k > 0 && strcmp(fn+k, backup_suffix_dels) == 0;
  }
  
- 
-@@ -1755,11 +1762,12 @@ void delete_missing(struct file_list *fu
- 		if ((j = flist_find(full_list, dir_list->files[i])) < 0
- 		    || (S_ISDIR(mode) && !S_ISDIR(full_list->files[j]->mode))) {
- 			char *f = f_name(dir_list->files[i]);
--			if (make_backups && (backup_dir || !is_backup_file(f))
-+			int backup_file = is_backup_file(f);
-+			if (make_backups && (backup_dir_rm || !backup_file)
- 			  && !S_ISDIR(mode)) {
--				make_backup(f);
-+				safe_delete(f);
- 				if (verbose) {
--					rprintf(FINFO, "deleting %s\n",
-+					rprintf(FINFO, "safe-deleting %s\n",
- 						safe_fname(f));
- 				}
- 			} else if (S_ISDIR(mode))
---- orig/options.c	2005-02-11 18:21:45
-+++ options.c	2005-01-28 19:17:35
-@@ -118,10 +118,14 @@ int no_detach = 0;
+ /* The directory is about to be deleted: if DEL_RECURSE is given, delete all
+@@ -162,9 +169,9 @@ enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
+ 		what = "rmdir";
+ 		ok = do_rmdir(fbuf) == 0;
+ 	} else {
+-		if (make_backups > 0 && !(flags & DEL_FOR_BACKUP) && (backup_dir || !is_backup_file(fbuf))) {
++		if (make_backups > 0 && !(flags & DEL_FOR_BACKUP) && (backup_dir_dels || !is_backup_file(fbuf))) {
+ 			what = "make_backup";
+-			ok = make_backup(fbuf, True);
++			ok = safe_delete(fbuf);
+ 			if (ok == 2) {
+ 				what = "unlink";
+ 				ok = robust_unlink(fbuf) == 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -151,10 +151,14 @@ int no_detach
  int write_batch = 0;
  int read_batch = 0;
  int backup_dir_len = 0;
-+int backup_dir_rm_len = 0;	
++int backup_dir_dels_len = 0;
  int backup_suffix_len;
-+int backup_suffix_rm_len;
++int backup_suffix_dels_len;
  unsigned int backup_dir_remainder;
-+unsigned int backup_dir_rm_remainder;
++unsigned int backup_dir_dels_remainder;
  
  char *backup_suffix = NULL;
-+char *backup_suffix_rm = NULL;
++char *backup_suffix_dels = NULL;
  char *tmpdir = NULL;
  char *partial_dir = NULL;
  char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -131,7 +135,9 @@ char *log_format = NULL;
+@@ -166,7 +170,9 @@ char *stdout_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
-+char *backup_dir_rm = NULL;
++char *backup_dir_dels = NULL;
  char backup_dir_buf[MAXPATHLEN];
-+char backup_dir_rm_buf[MAXPATHLEN];
- int rsync_port = 0;
- int compare_dest = 0;
- int copy_dest = 0;
-@@ -258,6 +264,8 @@ void usage(enum logcode F)
++char backup_dir_dels_buf[MAXPATHLEN];
+ char *sockopts = NULL;
+ char *usermap = NULL;
+ char *groupmap = NULL;
+@@ -671,6 +677,8 @@ void usage(enum logcode F)
    rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");
    rprintf(F,"     --backup-dir=DIR        make backups into hierarchy based in DIR\n");
    rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
-+  rprintf(F,"     --backup-dir-rm         make backups of removed files into current dir\n");
-+  rprintf(F,"     --backup-suffix-rm=SUF  set removed-files suffix (defaults to --suffix)\n");
++  rprintf(F,"     --backup-dir-dels=DIR   backup removed files into hierarchy based in DIR\n");
++  rprintf(F,"     --suffix-dels=SUFFIX    set removed-files suffix (def. --suffix w/o b-d-d)\n");
    rprintf(F," -u, --update                skip files that are newer on the receiver\n");
    rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
-   rprintf(F," -d, --dirs                  transfer directories without recursing\n");
-@@ -350,6 +358,7 @@ static struct poptOption long_options[] 
-   /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-   {"version",          0,  POPT_ARG_NONE,   0, OPT_VERSION, 0, 0},
-   {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-+  {"backup-suffix-rm", 0,  POPT_ARG_STRING, &backup_suffix_rm, 0, 0, 0 },
-   {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
-   {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
-   {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
-@@ -427,6 +436,7 @@ static struct poptOption long_options[] 
-   {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
-   {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
+   rprintf(F,"     --append                append data onto shorter files\n");
+@@ -974,7 +982,9 @@ static struct poptOption long_options[] = {
+   {"backup",          'b', POPT_ARG_VAL,    &make_backups, 1, 0, 0 },
+   {"no-backup",        0,  POPT_ARG_VAL,    &make_backups, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
-+  {"backup-dir-rm",    0,  POPT_ARG_STRING, &backup_dir_rm, 0, 0, 0 },
-   {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 0, 0 },
++  {"backup-dir-dels",  0,  POPT_ARG_STRING, &backup_dir_dels, 0, 0, 0 },
+   {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
++  {"suffix-dels",      0,  POPT_ARG_STRING, &backup_suffix_dels, 0, 0, 0 },
+   {"list-only",        0,  POPT_ARG_VAL,    &list_only, 2, 0, 0 },
    {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
    {"write-batch",      0,  POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
-@@ -968,6 +978,8 @@ int parse_arguments(int *argc, const cha
- 			partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
+@@ -2011,6 +2021,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ 			tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, SP_DEFAULT);
  		if (backup_dir)
- 			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
-+		if (backup_dir_rm)							
-+			backup_dir_rm = sanitize_path(NULL, backup_dir_rm, NULL, 0);
- 		if (files_from)
- 			files_from = sanitize_path(NULL, files_from, NULL, 0);
+ 			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, SP_DEFAULT);
++		if (backup_dir_dels)
++			backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, SP_DEFAULT);
  	}
-@@ -1000,6 +1012,12 @@ int parse_arguments(int *argc, const cha
- 			if (check_filter(elp, backup_dir, 1) < 0)
+ 	if (daemon_filter_list.head && !am_sender) {
+ 		filter_rule_list *elp = &daemon_filter_list;
+@@ -2032,6 +2044,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ 			if (check_filter(elp, FLOG, dir, 1) < 0)
  				goto options_rejected;
  		}
-+		/* Clean backup_dir_rm same as for backup_dir */
-+		if (backup_dir_rm) {
-+			clean_fname(backup_dir_rm, 1);
-+			if (check_exclude(elp, backup_dir_rm, 1) < 0)
++		/* Clean backup_dir_dels same as for backup_dir */
++		if (backup_dir_dels) {
++			if (!*backup_dir_dels)
++				goto options_rejected;
++			clean_fname(backup_dir_dels, 1);
++			if (check_filter(elp, FLOG, backup_dir_dels, 1) < 0)
 +				goto options_rejected;
 +		}
  	}
- 	if (server_filter_list.head && files_from) {
- 		if (!*files_from)
-@@ -1022,6 +1040,16 @@ int parse_arguments(int *argc, const cha
+ 
+ 	if (!backup_suffix)
+@@ -2043,6 +2063,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  			backup_suffix);
  		return 0;
  	}
-+	/* if suffix_rm not supplied, default to backup_suffix */
-+	if (!backup_suffix_rm)
-+		backup_suffix_rm = backup_dir_rm ? "" : backup_suffix;
-+	backup_suffix_rm_len = strlen(backup_suffix_rm);
-+	if (strchr(backup_suffix_rm, '/') != NULL) {
++	/* --suffix-dels defaults to --suffix, or empty for a client given an
++	 * explicit --backup-dir-dels (just as --suffix defaults to empty when
++	 * a --backup-dir is given).  The second case does not apply to the
++	 * server for consistency with server_options, which sends --suffix-dels
++	 * to the server iff it differs from --suffix. */
++	if (!backup_suffix_dels)
++		backup_suffix_dels = backup_dir_dels && !am_server ? "" : backup_suffix;
++	backup_suffix_dels_len = strlen(backup_suffix_dels);
++	if (strchr(backup_suffix_dels, '/') != NULL) {
 +		snprintf(err_buf, sizeof err_buf,
-+			"--backup-suffix-rm cannot contain slashes: %s\n",
-+			backup_suffix_rm);	
++			"--suffix-dels cannot contain slashes: %s\n",
++			backup_suffix_dels);
 +		return 0;
 +	}
  	if (backup_dir) {
- 		backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf);
- 		backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;
-@@ -1043,6 +1071,31 @@ int parse_arguments(int *argc, const cha
- 			"--suffix cannot be a null string without --backup-dir\n");
- 		return 0;
+ 		size_t len;
+ 		while (*backup_dir == '.' && backup_dir[1] == '/')
+@@ -2078,6 +2112,34 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ 			"P *%s", backup_suffix);
+ 		parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
  	}
-+	/* If backup_dir_rm not supplied default to backup_dir if it has been supplied */
-+	if (backup_dir && !backup_dir_rm) {
-+		backup_dir_rm = backup_dir;
-+		backup_dir_rm_len = backup_dir_len;
-+		backup_dir_rm_remainder = backup_dir_remainder;
-+		strlcpy(backup_dir_rm_buf, backup_dir_buf, sizeof backup_dir_buf);
-+	} else if (backup_dir_rm) {
-+		backup_dir_rm_len = strlcpy(backup_dir_rm_buf, backup_dir_rm, sizeof backup_dir_rm_buf);
-+		backup_dir_rm_remainder = sizeof backup_dir_rm_buf - backup_dir_rm_len;
-+		if (backup_dir_rm_remainder < 32) {
++	if (backup_dir_dels) {
++		backup_dir_dels_len = strlcpy(backup_dir_dels_buf, backup_dir_dels, sizeof backup_dir_dels_buf);
++		backup_dir_dels_remainder = sizeof backup_dir_dels_buf - backup_dir_dels_len;
++		if (backup_dir_dels_remainder < 32) {
 +			snprintf(err_buf, sizeof err_buf,
-+				"the --backup-dir-rm path is WAY too long.\n");
++				"the --backup-dir-dels path is WAY too long.\n");
 +			return 0;
 +		}
-+		if (backup_dir_rm_buf[backup_dir_rm_len - 1] != '/') {
-+			backup_dir_rm_buf[backup_dir_rm_len++] = '/';
-+			backup_dir_rm_buf[backup_dir_rm_len] = '\0';
++		if (backup_dir_dels_buf[backup_dir_dels_len - 1] != '/') {
++			backup_dir_dels_buf[backup_dir_dels_len++] = '/';
++			backup_dir_dels_buf[backup_dir_dels_len] = '\0';
 +		}
-+		if (verbose > 1 && !am_sender)
-+			rprintf(FINFO, "backup_dir_rm is %s\n", backup_dir_rm_buf);
-+	} else if (!backup_suffix_rm_len && (!am_server || !am_sender)) {
++		if (INFO_GTE(BACKUP, 1) && !am_sender)
++			rprintf(FINFO, "backup_dir_dels is %s\n", backup_dir_dels_buf);
++	} else if (backup_dir) {
++		backup_dir_dels = backup_dir;
++		backup_dir_dels_len = backup_dir_len;
++		backup_dir_dels_remainder = backup_dir_remainder;
++		strlcpy(backup_dir_dels_buf, backup_dir_buf, sizeof backup_dir_buf);
++	} else if (!backup_suffix_dels_len && (!am_server || !am_sender)) {
 +		snprintf(err_buf, sizeof err_buf,
-+			"--backup-suffix-rm cannot be a null string without --backup-dir-rm\n");
++			"--suffix-dels cannot be a null string without --backup-dir-dels\n");
 +		return 0;
++	} else if (make_backups && delete_mode && !delete_excluded && !am_server) {
++		snprintf(backup_dir_dels_buf, sizeof backup_dir_dels_buf,
++			"P *%s", backup_suffix_dels);
++		parse_rule(&filter_list, backup_dir_dels_buf, 0, 0);
 +	}
  
- 	if (do_progress && !verbose) {
- 		if (refused_verbose) {
-@@ -1279,6 +1332,10 @@ void server_options(char **args,int *arg
+ 	if (preserve_times) {
+ 		preserve_times = PRESERVE_FILE_TIMES;
+@@ -2499,6 +2561,10 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
-+	if (backup_dir_rm) {
-+		args[ac++] = "--backup-dir-rm";
-+		args[ac++] = backup_dir_rm;
++	if (backup_dir_dels && backup_dir_dels != backup_dir) {
++		args[ac++] = "--backup-dir-dels";
++		args[ac++] = backup_dir_dels;
 +	}
  
  	/* Only send --suffix if it specifies a non-default value. */
  	if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1287,7 +1344,13 @@ void server_options(char **args,int *arg
+@@ -2507,7 +2573,14 @@ void server_options(char **args, int *argc_p)
  			goto oom;
  		args[ac++] = arg;
  	}
 -
-+	/* Only send --backup-suffix-rm if it specifies a non-default value. */
-+	if (strcmp(backup_suffix_rm, backup_dir_rm ? "" : BACKUP_SUFFIX) != 0) {
++	/* Only send --suffix-dels if it specifies a value different from the
++	 * --suffix value, which would normally be used for deletions too. */
++	if (strcmp(backup_suffix_dels, backup_suffix) != 0) {
 +		/* We use the following syntax to avoid weirdness with '~'. */
-+		if (asprintf(&arg, "--backup-suffix-rm=%s", backup_suffix_rm) < 0)
++		if (asprintf(&arg, "--suffix-dels=%s", backup_suffix_dels) < 0)
 +			goto oom;
 +		args[ac++] = arg;
 +	}
  	if (am_sender) {
- 		if (delete_excluded)
- 			args[ac++] = "--delete-excluded";
+ 		if (max_delete > 0) {
+ 			if (asprintf(&arg, "--max-delete=%d", max_delete) < 0)