X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/abd3adb8322a8ec12880059cef05a18e5ce8a0aa..5214a41bbae94607b196b199b483710e1babf292:/backup-dir-dels.diff

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 3919e07..3b1282e 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -19,10 +19,11 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
+based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
 diff --git a/backup.c b/backup.c
 --- 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;
@@ -36,98 +37,130 @@ diff --git a/backup.c b/backup.c
  extern char *backup_dir;
 +extern char *backup_dir_dels;
 +
-+static int deleting;
++static BOOL deleting;
  
- /* make a complete pathname for backup file */
- char *get_backup_name(const char *fname)
-@@ -51,11 +58,28 @@ 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;
-+}
-+
- /* simple backup creates a backup with a suffix in the same directory */
- static int make_simple_backup(const char *fname)
- {
- 	int rename_errno;
--	const char *fnamebak = get_backup_name(fname);
-+	const char *fnamebak = deleting ? get_delete_name(fname)
-+					: get_backup_name(fname);
- 
- 	if (!fnamebak)
- 		return 0;
-@@ -96,7 +120,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] == '/') {
-@@ -221,7 +245,8 @@ static int keep_backup(const char *fname)
- 	if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
- 		return 1; /* the file could have disappeared */
- 
--	if (!(buf = get_backup_name(fname))) {
-+	buf = deleting ? get_delete_name(fname) : get_backup_name(fname);
-+	if (!buf) {
- 		unmake_file(file);
- 		return 0;
+ 	for (f = fname, b = rel; *f && *f == *b; f++, b++) {
+ 		if (*b == '/')
+ 			name = b + 1;
  	}
-@@ -356,7 +381,17 @@ static int keep_backup(const char *fname)
- /* main backup switch routine */
- int make_backup(const char *fname)
+ 
+-	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)
  {
--	if (backup_dir)
-+	if (deleting ? backup_dir_dels : backup_dir)
- 		return keep_backup(fname);
- 	return make_simple_backup(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;
  }
 +
 +/* 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;
 +}
-diff --git a/generator.c b/generator.c
---- a/generator.c
-+++ b/generator.c
-@@ -96,6 +96,9 @@ extern uid_t our_uid;
+diff --git a/delete.c b/delete.c
+--- a/delete.c
++++ b/delete.c
+@@ -28,6 +28,9 @@ extern int max_delete;
  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 *cur_flist, *first_flist, *dir_flist;
- extern struct filter_list_struct daemon_filter_list;
+ extern uid_t our_uid;
+ extern struct stats stats;
  
-@@ -142,10 +145,15 @@ static void handle_skipped_hlink(struct file_struct *file, int itemizing,
- 				 enum logcode code, int f_out);
- #endif
+@@ -35,10 +38,14 @@ int ignore_perishable = 0;
+ int non_perishable_cnt = 0;
+ int skipped_deletes = 0;
  
-+
 +/* Function now compares both backup_suffix and backup_suffix_dels. */
- static int is_backup_file(char *fn)
+ static inline int is_backup_file(char *fn)
  {
  	int k = strlen(fn) - backup_suffix_len;
 -	return k > 0 && strcmp(fn+k, backup_suffix) == 0;
@@ -137,23 +170,23 @@ diff --git a/generator.c b/generator.c
 +	return k > 0 && strcmp(fn+k, backup_suffix_dels) == 0;
  }
  
- /* Delete a file or directory.  If DEL_RECURSE is set in the flags, this will
-@@ -193,9 +201,9 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
- 	if (S_ISDIR(mode)) {
+ /* The directory is about to be deleted: if DEL_RECURSE is given, delete all
+@@ -170,9 +177,9 @@ enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
  		what = "rmdir";
  		ok = do_rmdir(fbuf) == 0;
--	} else if (make_backups > 0 && (backup_dir || !is_backup_file(fbuf))) {
-+	} else if (make_backups > 0 && (backup_dir_dels || !is_backup_file(fbuf))) {
- 		what = "make_backup";
--		ok = make_backup(fbuf);
-+		ok = safe_delete(fbuf);
  	} else {
- 		what = "unlink";
- 		ok = robust_unlink(fbuf) == 0;
+-		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
-@@ -150,10 +150,14 @@ int no_detach
+@@ -151,10 +151,14 @@ int no_detach
  int write_batch = 0;
  int read_batch = 0;
  int backup_dir_len = 0;
@@ -168,7 +201,7 @@ diff --git a/options.c b/options.c
  char *tmpdir = NULL;
  char *partial_dir = NULL;
  char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -165,7 +169,9 @@ char *stdout_format = NULL;
+@@ -166,7 +170,9 @@ char *stdout_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
@@ -176,9 +209,9 @@ diff --git a/options.c b/options.c
  char backup_dir_buf[MAXPATHLEN];
 +char backup_dir_dels_buf[MAXPATHLEN];
  char *sockopts = NULL;
- int rsync_port = 0;
- int compare_dest = 0;
-@@ -326,6 +332,8 @@ void usage(enum logcode F)
+ char *usermap = NULL;
+ char *groupmap = NULL;
+@@ -670,6 +676,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);
@@ -187,7 +220,7 @@ diff --git a/options.c b/options.c
    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,"     --append                append data onto shorter files\n");
-@@ -610,7 +618,9 @@ static struct poptOption long_options[] = {
+@@ -969,7 +977,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 },
@@ -197,7 +230,7 @@ diff --git a/options.c b/options.c
    {"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 },
-@@ -1454,6 +1464,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1991,6 +2001,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);
@@ -205,8 +238,8 @@ diff --git a/options.c b/options.c
 +			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;
-@@ -1475,6 +1487,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ 		filter_rule_list *elp = &daemon_filter_list;
+@@ -2012,6 +2024,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  			if (check_filter(elp, FLOG, dir, 1) < 0)
  				goto options_rejected;
  		}
@@ -221,7 +254,7 @@ diff --git a/options.c b/options.c
  	}
  
  	if (!backup_suffix)
-@@ -1486,6 +1506,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2023,6 +2043,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  			backup_suffix);
  		return 0;
  	}
@@ -240,11 +273,11 @@ diff --git a/options.c b/options.c
 +		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;
-@@ -1509,6 +1543,34 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ 		while (*backup_dir == '.' && backup_dir[1] == '/')
+ 			backup_dir += 2;
+@@ -2056,6 +2090,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);
@@ -258,7 +291,7 @@ diff --git a/options.c b/options.c
 +			backup_dir_dels_buf[backup_dir_dels_len++] = '/';
 +			backup_dir_dels_buf[backup_dir_dels_len] = '\0';
 +		}
-+		if (verbose > 1 && !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;
@@ -277,7 +310,7 @@ diff --git a/options.c b/options.c
  
  	if (make_backups && !backup_dir) {
  		omit_dir_times = 0; /* Implied, so avoid -O to sender. */
-@@ -1917,6 +1979,10 @@ void server_options(char **args, int *argc_p)
+@@ -2469,6 +2531,10 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
@@ -288,7 +321,7 @@ diff --git a/options.c b/options.c
  
  	/* Only send --suffix if it specifies a non-default value. */
  	if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1925,7 +1991,14 @@ void server_options(char **args, int *argc_p)
+@@ -2477,7 +2543,14 @@ void server_options(char **args, int *argc_p)
  			goto oom;
  		args[ac++] = arg;
  	}