X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fc5573623194fab2a331d1ffc8d284c9e25e06e7..7170ca8dba0a407cd0c91b41b48163c7b682abb1:/backup-dir-dels.diff

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 96a2f41..dd54b47 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -19,11 +19,11 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
 diff --git a/backup.c b/backup.c
-index 0da6b33..ff77078 100644
 --- a/backup.c
 +++ b/backup.c
-@@ -29,10 +29,17 @@ extern int preserve_specials;
+@@ -29,29 +29,36 @@ extern int preserve_specials;
  extern int preserve_links;
  extern int safe_symlinks;
  extern int backup_dir_len;
@@ -39,51 +39,97 @@ index 0da6b33..ff77078 100644
 +
 +static BOOL deleting;
  
- /* make a complete pathname for backup file */
- char *get_backup_name(const char *fname)
-@@ -51,6 +58,22 @@ char *get_backup_name(const char *fname)
- 	return NULL;
- }
- 
-+static char *get_delete_name(const char *fname)
-+{
-+	if (backup_dir_dels) {
-+		if (stringjoin(backup_dir_dels_buf + backup_dir_dels_len, backup_dir_dels_remainder,
-+			       fname, backup_suffix_dels, NULL) < backup_dir_dels_remainder)
-+			return backup_dir_dels_buf;
-+	} else {
-+		if (stringjoin(backup_dir_dels_buf, MAXPATHLEN,
-+			       fname, backup_suffix_dels, NULL) < MAXPATHLEN)
-+			return backup_dir_dels_buf;
-+	}
-+
-+	rprintf(FERROR, "delete filename too long\n");
-+	return NULL;
-+}
-+
- /****************************************************************************
- Create a directory given an absolute path, perms based upon another directory
- path
-@@ -59,7 +82,7 @@ int make_bak_dir(const char *fullpath)
+ /* Create a backup path from the given fname, putting the result into
+  * 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)
  {
- 	char fbuf[MAXPATHLEN], *rel, *end, *p;
- 	struct file_struct *file;
--	int len = backup_dir_len;
-+	int len = deleting ? backup_dir_dels_len : backup_dir_len;
+ 	const char *f;
+ 	int flags;
+ 	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;
  
- 	while (*fullpath == '.' && fullpath[1] == '/') {
-@@ -179,7 +202,7 @@ int make_backup(const char *fname, BOOL prefer_rename)
- 	stat_x sx;
- 	struct file_struct *file;
- 	int save_preserve_xattrs;
--	char *buf = get_backup_name(fname);
-+	char *buf = deleting ? get_delete_name(fname) : get_backup_name(fname);
- 	int ret = 0;
+ 	for (f = fname, b = rel; *f && *f == *b; f++, b++) {
+ 		if (*b == '/')
+ 			name = b + 1;
+ 	}
  
- 	if (!buf)
-@@ -341,3 +364,13 @@ int make_backup(const char *fname, BOOL prefer_rename)
+-	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;
+@@ -62,16 +69,16 @@ static BOOL copy_valid_path(const char *fname)
+ 			return True;
+ 		*b = '\0';
+ 
+-		if (do_lstat(backup_dir_buf, &sx.st) < 0) {
++		if (do_lstat(buf, &sx.st) < 0) {
+ 			if (errno == ENOENT)
+ 				break;
+-			rsyserr(FERROR, errno, "backup lstat %s failed", backup_dir_buf);
++			rsyserr(FERROR, errno, "backup lstat %s failed", buf);
+ 			*name = '\0';
+ 			return False;
+ 		}
+ 		if (!S_ISDIR(sx.st.st_mode)) {
+ 			flags = get_del_for_flag(sx.st.st_mode) | DEL_FOR_BACKUP | DEL_RECURSE;
+-			if (delete_item(backup_dir_buf, sx.st.st_mode, flags) == 0)
++			if (delete_item(buf, sx.st.st_mode, flags) == 0)
+ 				break;
+ 			*name = '\0';
+ 			return False;
+@@ -85,8 +92,8 @@ static BOOL copy_valid_path(const char *fname)
+ 	for ( ; b; name = b + 1, b = strchr(name, '/')) {
+ 		*b = '\0';
+ 
+-		if (mkdir_defmode(backup_dir_buf) < 0) {
+-			rsyserr(FERROR, errno, "backup mkdir %s failed", backup_dir_buf);
++		if (mkdir_defmode(buf) < 0) {
++			rsyserr(FERROR, errno, "backup mkdir %s failed", buf);
+ 			*name = '\0';
+ 			ret = False;
+ 			break;
+@@ -114,7 +121,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);
+ 		}
+ 
+@@ -134,15 +141,20 @@ 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;
+ 		return NULL;
+ 	} else {
+ 		if (stringjoin(backup_dir_buf, MAXPATHLEN,
+-			       fname, backup_suffix, NULL) < MAXPATHLEN)
+-			return backup_dir_buf;
++			       fname, suffix, NULL) < MAXPATHLEN)
++			return buf;
  	}
+ 
+ 	rprintf(FERROR, "backup filename too long\n");
+@@ -317,3 +329,13 @@ int make_backup(const char *fname, BOOL prefer_rename)
+ 		rprintf(FINFO, "backed up %s to %s\n", fname, buf);
  	return ret;
  }
 +
@@ -97,7 +143,6 @@ index 0da6b33..ff77078 100644
 +	return ret;
 +}
 diff --git a/delete.c b/delete.c
-index 33fdd0e..31228d0 100644
 --- a/delete.c
 +++ b/delete.c
 @@ -28,6 +28,9 @@ extern int max_delete;
@@ -130,8 +175,8 @@ index 33fdd0e..31228d0 100644
  		what = "rmdir";
  		ok = do_rmdir(fbuf) == 0;
  	} else {
--		if (make_backups > 0 && (backup_dir || !is_backup_file(fbuf))) {
-+		if (make_backups > 0 && (backup_dir_dels || !is_backup_file(fbuf))) {
+-		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);
@@ -139,7 +184,6 @@ index 33fdd0e..31228d0 100644
  				what = "unlink";
  				ok = robust_unlink(fbuf) == 0;
 diff --git a/options.c b/options.c
-index e7c6c61..37e4086 100644
 --- a/options.c
 +++ b/options.c
 @@ -151,10 +151,14 @@ int no_detach
@@ -186,7 +230,7 @@ index e7c6c61..37e4086 100644
    {"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 },
-@@ -1964,6 +1974,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1971,6 +1981,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, SP_DEFAULT);
@@ -194,8 +238,8 @@ index e7c6c61..37e4086 100644
 +			backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, SP_DEFAULT);
  	}
  	if (daemon_filter_list.head && !am_sender) {
- 		struct filter_list_struct *elp = &daemon_filter_list;
-@@ -1985,6 +1997,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ 		filter_rule_list *elp = &daemon_filter_list;
+@@ -1992,6 +2004,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  			if (check_filter(elp, FLOG, dir, 1) < 0)
  				goto options_rejected;
  		}
@@ -210,7 +254,7 @@ index e7c6c61..37e4086 100644
  	}
  
  	if (!backup_suffix)
-@@ -1996,6 +2016,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2003,6 +2023,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  			backup_suffix);
  		return 0;
  	}
@@ -229,11 +273,11 @@ index e7c6c61..37e4086 100644
 +		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;
-@@ -2019,6 +2053,34 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ 		while (*backup_dir == '.' && backup_dir[1] == '/')
+ 			backup_dir += 2;
+@@ -2036,6 +2070,34 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  			"P *%s", backup_suffix);
- 		parse_rule(&filter_list, backup_dir_buf, 0, 0);
+ 		parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
  	}
 +	if (backup_dir_dels) {
 +		backup_dir_dels_len = strlcpy(backup_dir_dels_buf, backup_dir_dels, sizeof backup_dir_dels_buf);
@@ -266,7 +310,7 @@ index e7c6c61..37e4086 100644
  
  	if (make_backups && !backup_dir) {
  		omit_dir_times = 0; /* Implied, so avoid -O to sender. */
-@@ -2432,6 +2494,10 @@ void server_options(char **args, int *argc_p)
+@@ -2449,6 +2511,10 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
@@ -277,7 +321,7 @@ index e7c6c61..37e4086 100644
  
  	/* Only send --suffix if it specifies a non-default value. */
  	if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -2440,7 +2506,14 @@ void server_options(char **args, int *argc_p)
+@@ -2457,7 +2523,14 @@ void server_options(char **args, int *argc_p)
  			goto oom;
  		args[ac++] = arg;
  	}