X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/3d26c375e3f894f3fc07070e4ff0b4c43bf03bf7..8af144e1ca43235afa9d81a545b8a0ae829cbb56:/backup-dir-dels.diff

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 8b3660e..0c17fec 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -14,7 +14,7 @@ suffix.
 
 Marc St-Onge
 
---- orig/backup.c	2004-10-06 00:12:15
+--- orig/backup.c	2005-01-25 12:14:14
 +++ backup.c	2004-09-22 02:36:06
 @@ -22,11 +22,17 @@
  
@@ -82,8 +82,8 @@ Marc St-Onge
  	char *end = rel + strlen(rel);
  	char *p = end;
  
-@@ -173,7 +199,8 @@ static int keep_backup(char *fname)
- 	if (!(file = make_file(fname, NULL, NO_EXCLUDES)))
+@@ -168,7 +194,8 @@ static int keep_backup(char *fname)
+ 	if (!(file = make_file(fname, NULL, NO_FILTERS)))
  		return 1; /* the file could have disappeared */
  
 -	if (!(buf = get_backup_name(fname)))
@@ -92,7 +92,7 @@ Marc St-Onge
  		return 0;
  
  	/* Check to see if this is a device file, or link */
-@@ -264,3 +291,13 @@ int make_backup(char *fname)
+@@ -259,3 +286,13 @@ int make_backup(char *fname)
  		return keep_backup(fname);
  	return make_simple_backup(fname);
  }
@@ -106,9 +106,60 @@ Marc St-Onge
 +	deleting = 0;
 +	return ret;
 +}
---- orig/options.c	2004-10-14 17:11:40
-+++ options.c	2004-09-22 02:25:03
-@@ -113,10 +113,14 @@ int no_detach = 0;
+--- orig/flist.c	2005-01-25 12:14:14
++++ flist.c	2005-01-24 02:21:33
+@@ -47,6 +47,8 @@ extern char curr_dir[MAXPATHLEN];
+ extern unsigned int curr_dir_len;
+ extern char *backup_dir;
+ extern char *backup_suffix;
++extern char *delete_dir;
++extern char *delete_suffix;
+ extern int filesfrom_fd;
+ 
+ extern int one_file_system;
+@@ -61,6 +63,7 @@ extern int relative_paths;
+ extern int implied_dirs;
+ extern int make_backups;
+ extern int backup_suffix_len;
++extern int delete_suffix_len;
+ extern int copy_links;
+ extern int copy_unsafe_links;
+ extern int protocol_version;
+@@ -1659,10 +1662,14 @@ char *f_name(struct file_struct *f)
+ 	return f_name_to(f, names[n]);
+ }
+ 
++/* Function now checks if file matches backup or delete suffix patterns */
+ static 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 - delete_suffix_len;
++	return k > 0 && strcmp(fn+k, delete_suffix) == 0;
+ }
+ 
+ void delete_in_dir(struct file_list *flist, char *fname)
+@@ -1716,11 +1723,12 @@ void delete_in_dir(struct file_list *fli
+ 		    || (delete_during && S_ISDIR(mode)
+ 		     && !S_ISDIR(flist->files[j]->mode))) {
+ 			char *f = f_name(del_flist->files[i]);
+-			if (make_backups && (backup_dir || !is_backup_file(f))
++			int backup_file = is_backup_file(f);
++			if (make_backups && (delete_dir || !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 {
+--- orig/options.c	2005-01-25 12:14:14
++++ options.c	2004-11-27 18:37:18
+@@ -119,10 +119,14 @@ int no_detach = 0;
  int write_batch = 0;
  int read_batch = 0;
  int backup_dir_len = 0;
@@ -122,18 +173,18 @@ Marc St-Onge
 +char *delete_suffix = NULL;
  char *tmpdir = NULL;
  char *partial_dir = NULL;
- char *compare_dest = NULL;
-@@ -126,7 +130,9 @@ char *log_format = NULL;
+ char *basis_dir[MAX_BASIS_DIRS+1];
+@@ -132,7 +136,9 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
 +char *delete_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
 +char delete_dir_buf[MAXPATHLEN];
- int rsync_port = RSYNC_PORT;
- int link_dest = 0;
- 
-@@ -239,7 +245,9 @@ void usage(enum logcode F)
+ int rsync_port = 0;
+ int compare_dest = 0;
+ int copy_dest = 0;
+@@ -251,7 +257,9 @@ void usage(enum logcode F)
    rprintf(F,"     --no-implied-dirs       don't send implied dirs with -R\n");
    rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");
    rprintf(F,"     --backup-dir            make backups into this directory\n");
@@ -141,9 +192,9 @@ Marc St-Onge
    rprintf(F,"     --suffix=SUFFIX         backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
 +  rprintf(F,"     --delete-suffix=SUFFIX  deleted files suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
    rprintf(F," -u, --update                update only (don't overwrite newer files)\n");
-   rprintf(F,"     --inplace               update destination files inplace (SEE MAN PAGE)\n");
-   rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
-@@ -319,6 +327,7 @@ static struct poptOption long_options[] 
+   rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
+   rprintf(F," -d, --dirs                  transfer directories without recursing\n");
+@@ -342,6 +350,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 },
@@ -151,7 +202,7 @@ Marc St-Onge
    {"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 },
-@@ -384,6 +393,7 @@ static struct poptOption long_options[] 
+@@ -416,6 +425,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 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
@@ -159,8 +210,8 @@ Marc St-Onge
    {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 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 },
-@@ -796,6 +806,8 @@ int parse_arguments(int *argc, const cha
- 			compare_dest = sanitize_path(NULL, compare_dest, NULL, 0);
+@@ -918,6 +928,8 @@ int parse_arguments(int *argc, const cha
+ 			partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
  		if (backup_dir)
  			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
 +		if (delete_dir)							
@@ -168,8 +219,8 @@ Marc St-Onge
  		if (files_from)
  			files_from = sanitize_path(NULL, files_from, NULL, 0);
  	}
-@@ -821,6 +833,12 @@ int parse_arguments(int *argc, const cha
- 			if (check_exclude(elp, backup_dir, 1) < 0)
+@@ -944,6 +956,12 @@ int parse_arguments(int *argc, const cha
+ 			if (check_filter(elp, backup_dir, 1) < 0)
  				goto options_rejected;
  		}
 +		/* Clean delete_dir same as for backup_dir */
@@ -179,9 +230,9 @@ Marc St-Onge
 +				goto options_rejected;
 +		}
  	}
- 	if (server_exclude_list.head && files_from) {
+ 	if (server_filter_list.head && files_from) {
  		clean_fname(files_from, 1);
-@@ -841,6 +859,16 @@ int parse_arguments(int *argc, const cha
+@@ -964,6 +982,16 @@ int parse_arguments(int *argc, const cha
  			backup_suffix);
  		return 0;
  	}
@@ -198,7 +249,7 @@ 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;
-@@ -860,6 +888,31 @@ int parse_arguments(int *argc, const cha
+@@ -983,6 +1011,31 @@ int parse_arguments(int *argc, const cha
  			"--suffix cannot be a null string without --backup-dir\n");
  		return 0;
  	}
@@ -230,7 +281,7 @@ Marc St-Onge
  
  	if (do_progress && !verbose)
  		verbose = 1;
-@@ -1066,6 +1119,10 @@ void server_options(char **args,int *arg
+@@ -1196,6 +1249,10 @@ void server_options(char **args,int *arg
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
@@ -241,7 +292,7 @@ Marc St-Onge
  
  	/* Only send --suffix if it specifies a non-default value. */
  	if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1074,7 +1131,13 @@ void server_options(char **args,int *arg
+@@ -1204,7 +1261,13 @@ void server_options(char **args,int *arg
  			goto oom;
  		args[ac++] = arg;
  	}
@@ -256,50 +307,3 @@ Marc St-Onge
  	if (am_sender) {
  		if (delete_excluded)
  			args[ac++] = "--delete-excluded";
---- orig/receiver.c	2004-11-03 20:30:45
-+++ receiver.c	2004-11-03 23:10:06
-@@ -43,8 +43,11 @@ extern char *compare_dest;
- extern int make_backups;
- extern int do_progress;
- extern char *backup_dir;
-+extern char *delete_dir;
- extern char *backup_suffix;
-+extern char *delete_suffix;
- extern int backup_suffix_len;
-+extern int delete_suffix_len;
- extern int cleanup_got_literal;
- extern int module_id;
- extern int ignore_errors;
-@@ -78,11 +81,14 @@ static void delete_one(char *fn, int is_
- 	}
- }
- 
--
-+/* Function now checks if file matches backup or delete suffix patterns */
- static 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 = strlen(fn) - delete_suffix_len;
-+	return k > 0 && strcmp(fn+k, delete_suffix) == 0;
- }
- 
- 
-@@ -124,11 +130,12 @@ void delete_files(struct file_list *flis
- 			if (flist_find(flist,local_file_list->files[i]) < 0) {
- 				char *f = f_name(local_file_list->files[i]);
- 				int mode = local_file_list->files[i]->mode;
--				if (make_backups && (backup_dir || !is_backup_file(f))
-+				int backup_file = is_backup_file(f);
-+				if (make_backups && (delete_dir || !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