X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/37d900d6279dce15e3f37a071f0d71c53e68ece9..6240d1e484dd4e3cc4d0dad8d47d58193354784e:/backup-dir-dels.diff

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 5592699..a724472 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -13,13 +13,17 @@ suffix.
 
 Marc St-Onge
 
---- orig/backup.c	2005-11-10 16:58:36
-+++ backup.c	2005-02-22 02:11:15
-@@ -22,11 +22,17 @@
- 
- extern int verbose;
- extern int backup_suffix_len;
-+extern int backup_suffix_dels_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
+
+--- old/backup.c
++++ new/backup.c
+@@ -29,10 +29,17 @@ extern int preserve_specials;
+ extern int preserve_links;
+ extern int safe_symlinks;
  extern int backup_dir_len;
 +extern int backup_dir_dels_len;
  extern unsigned int backup_dir_remainder;
@@ -30,23 +34,16 @@ Marc St-Onge
 +extern char *backup_suffix_dels;
  extern char *backup_dir;
 +extern char *backup_dir_dels;
- 
- 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;
 +
++static int deleting;
+ 
  /* make a complete pathname for backup file */
- char *get_backup_name(char *fname)
- {
-@@ -52,11 +60,28 @@ char *get_backup_name(char *fname)
+ 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(char *fname)
++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,
@@ -63,36 +60,35 @@ Marc St-Onge
 +}
 +
  /* simple backup creates a backup with a suffix in the same directory */
- static int make_simple_backup(char *fname)
+ static int make_simple_backup(const char *fname)
  {
  	int rename_errno;
--	char *fnamebak = get_backup_name(fname);
-+	char *fnamebak = deleting ? get_delete_name(fname)
-+				  : get_backup_name(fname);
+-	const char *fnamebak = get_backup_name(fname);
++	const char *fnamebak = deleting ? get_delete_name(fname)
++					: get_backup_name(fname);
  
  	if (!fnamebak)
  		return 0;
-@@ -97,7 +122,8 @@ path
- static int make_bak_dir(char *fullpath)
+@@ -96,7 +120,7 @@ int make_bak_dir(const char *fullpath)
  {
- 	STRUCT_STAT st;
--	char *rel = fullpath + backup_dir_len;
-+	int dir_len = deleting ? backup_dir_dels_len : backup_dir_len;
-+	char *rel = fullpath + dir_len;
- 	char *end = rel + strlen(rel);
- 	char *p = end;
+ 	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;
+ 	stat_x sx;
  
-@@ -184,7 +210,8 @@ static int keep_backup(char *fname)
- 	if (!(file = make_file(fname, NULL, NO_FILTERS)))
+ 	while (*fullpath == '.' && fullpath[1] == '/') {
+@@ -211,7 +235,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)))
+-	if (!(buf = get_backup_name(fname))) {
 +	buf = deleting ? get_delete_name(fname) : get_backup_name(fname);
-+	if (!buf)
++	if (!buf) {
+ 		unmake_file(file);
  		return 0;
- 
- 	/* Check to see if this is a device file, or link */
-@@ -278,3 +305,13 @@ int make_backup(char *fname)
+ 	}
+@@ -326,3 +351,13 @@ int make_backup(const char *fname)
  		return keep_backup(fname);
  	return make_simple_backup(fname);
  }
@@ -106,20 +102,20 @@ Marc St-Onge
 +	deleting = 0;
 +	return ret;
 +}
---- orig/generator.c	2005-11-12 20:31:04
-+++ generator.c	2005-11-15 07:02:12
-@@ -89,6 +89,9 @@ extern dev_t filesystem_dev;
+--- old/generator.c
++++ new/generator.c
+@@ -93,6 +93,9 @@ extern mode_t orig_umask;
  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 file_list *cur_flist, *first_flist, *dir_flist;
  extern struct filter_list_struct server_filter_list;
- 
-@@ -99,10 +102,14 @@ static int deletion_count = 0; /* used t
- #define DEL_TERSE		(1<<3)
+ #ifdef ICONV_OPTION
+@@ -130,10 +133,14 @@ enum delret {
+ static enum delret delete_dir_contents(char *fname, int flags);
  
  
 +/* Function now compares both backup_suffix and backup_suffix_dels. */
@@ -133,33 +129,22 @@ Marc St-Onge
 +	return k > 0 && strcmp(fn+k, backup_suffix_dels) == 0;
  }
  
- 
-@@ -123,8 +130,8 @@ static int delete_item(char *fname, int 
- 	if (!S_ISDIR(mode)) {
- 		if (max_delete && ++deletion_count > max_delete)
- 			return 0;
--		if (make_backups && (backup_dir || !is_backup_file(fname)))
--			ok = make_backup(fname);
-+		if (make_backups && (backup_dir_dels || !is_backup_file(fname)))
-+			ok = safe_delete(fname);
- 		else
- 			ok = robust_unlink(fname) == 0;
- 		if (ok) {
-@@ -146,9 +153,9 @@ static int delete_item(char *fname, int 
- 	    || (dry_run && zap_dir)) {
- 		ok = 0;
- 		errno = ENOTEMPTY;
--	} else if (make_backups && !backup_dir && !is_backup_file(fname)
-+	} else if (make_backups && !backup_dir_dels && !is_backup_file(fname)
- 	    && !(flags & DEL_FORCE_RECURSE))
--		ok = make_backup(fname);
-+		ok = safe_delete(fname);
- 	else
- 		ok = do_rmdir(fname) == 0;
- 	if (ok) {
---- orig/options.c	2005-11-15 18:21:22
-+++ options.c	2005-11-07 04:35:54
-@@ -132,10 +132,14 @@ int no_detach
+ /* Delete a file or directory.  If DEL_RECURSE is set in the flags, this will
+@@ -169,9 +176,9 @@ static enum delret delete_item(char *fbu
+ 	if (S_ISDIR(mode)) {
+ 		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;
+--- old/options.c
++++ new/options.c
+@@ -147,10 +147,14 @@ int no_detach
  int write_batch = 0;
  int read_batch = 0;
  int backup_dir_len = 0;
@@ -174,17 +159,17 @@ Marc St-Onge
  char *tmpdir = NULL;
  char *partial_dir = NULL;
  char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -146,7 +150,9 @@ char *password_file = NULL;
+@@ -162,7 +166,9 @@ char *stdout_format = NULL;
+ char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
- char *chmod_mode = NULL;
 +char *backup_dir_dels = NULL;
  char backup_dir_buf[MAXPATHLEN];
 +char backup_dir_dels_buf[MAXPATHLEN];
+ char *sockopts = NULL;
  int rsync_port = 0;
  int compare_dest = 0;
- int copy_dest = 0;
-@@ -279,6 +285,8 @@ void usage(enum logcode F)
+@@ -318,6 +324,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);
@@ -193,9 +178,9 @@ Marc St-Onge
    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");
-@@ -478,7 +486,9 @@ static struct poptOption long_options[] 
-   {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
-   {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
+@@ -588,7 +596,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-dels",  0,  POPT_ARG_STRING, &backup_dir_dels, 0, 0, 0 },
    {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
@@ -203,18 +188,18 @@ Marc St-Onge
    {"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 },
-@@ -1142,6 +1152,8 @@ int parse_arguments(int *argc, const cha
- 			partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
+@@ -1400,6 +1410,8 @@ int parse_arguments(int *argc_p, const c
+ 			tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
  		if (backup_dir)
- 			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
-+		if (backup_dir_dels)							
-+			backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0);
+ 			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL);
++		if (backup_dir_dels)
++			backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, NULL);
  	}
  	if (server_filter_list.head && !am_sender) {
  		struct filter_list_struct *elp = &server_filter_list;
-@@ -1176,6 +1188,14 @@ int parse_arguments(int *argc, const cha
- 				return 0;
- 			}
+@@ -1417,6 +1429,14 @@ int parse_arguments(int *argc_p, const c
+ 			if (check_filter(elp, backup_dir, 1) < 0)
+ 				goto options_rejected;
  		}
 +		/* Clean backup_dir_dels same as for backup_dir */
 +		if (backup_dir_dels) {
@@ -227,7 +212,7 @@ Marc St-Onge
  	}
  
  	if (!backup_suffix)
-@@ -1187,6 +1207,16 @@ int parse_arguments(int *argc, const cha
+@@ -1428,6 +1448,16 @@ int parse_arguments(int *argc_p, const c
  			backup_suffix);
  		return 0;
  	}
@@ -244,9 +229,9 @@ Marc St-Onge
  	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;
-@@ -1208,6 +1238,31 @@ int parse_arguments(int *argc, const cha
- 			"--suffix cannot be a null string without --backup-dir\n");
- 		return 0;
+@@ -1451,6 +1481,31 @@ int parse_arguments(int *argc_p, const c
+ 			"P *%s", backup_suffix);
+ 		parse_rule(&filter_list, backup_dir_buf, 0, 0);
  	}
 +	/* If backup_dir_dels not supplied default to backup_dir if it has been supplied */
 +	if (backup_dir && !backup_dir_dels) {
@@ -273,10 +258,10 @@ Marc St-Onge
 +			"--suffix-dels cannot be a null string without --backup-dir-dels\n");
 +		return 0;
 +	}
- 	if (make_backups && !backup_dir)
- 		omit_dir_times = 1;
  
-@@ -1530,6 +1585,10 @@ void server_options(char **args,int *arg
+ 	if (make_backups && !backup_dir) {
+ 		omit_dir_times = 0; /* Implied, so avoid -O to sender. */
+@@ -1845,6 +1900,10 @@ void server_options(char **args, int *ar
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
@@ -287,7 +272,7 @@ Marc St-Onge
  
  	/* Only send --suffix if it specifies a non-default value. */
  	if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1538,7 +1597,13 @@ void server_options(char **args,int *arg
+@@ -1853,7 +1912,13 @@ void server_options(char **args, int *ar
  			goto oom;
  		args[ac++] = arg;
  	}
@@ -300,5 +285,5 @@ Marc St-Onge
 +		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)