X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/44917741b23c90d255581341f3eca6f7d7e9c794..4c1f2ca50862d18735c83dda3bc7f7d78bc55186:/backup-dir-dels.diff

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 2c8e7ca..8b3660e 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -14,7 +14,7 @@ suffix.
 
 Marc St-Onge
 
---- orig/backup.c	2004-09-20 19:50:13
+--- orig/backup.c	2004-10-06 00:12:15
 +++ backup.c	2004-09-22 02:36:06
 @@ -22,11 +22,17 @@
  
@@ -91,8 +91,8 @@ Marc St-Onge
 +	if (!buf)
  		return 0;
  
- #ifdef HAVE_MKNOD
-@@ -266,3 +293,13 @@ int make_backup(char *fname)
+ 	/* Check to see if this is a device file, or link */
+@@ -264,3 +291,13 @@ int make_backup(char *fname)
  		return keep_backup(fname);
  	return make_simple_backup(fname);
  }
@@ -106,7 +106,7 @@ Marc St-Onge
 +	deleting = 0;
 +	return ret;
 +}
---- orig/options.c	2004-09-20 05:10:48
+--- 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;
  int write_batch = 0;
@@ -143,23 +143,23 @@ Marc St-Onge
    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");
-@@ -326,6 +334,7 @@ static struct poptOption long_options[] 
+@@ -319,6 +327,7 @@ static struct poptOption long_options[] 
    /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-   {"version",          0,  POPT_ARG_NONE,   0,              OPT_VERSION, 0, 0},
+   {"version",          0,  POPT_ARG_NONE,   0, OPT_VERSION, 0, 0},
    {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
 +  {"delete-suffix",    0,  POPT_ARG_STRING, &delete_suffix, 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 },
-@@ -396,6 +405,7 @@ static struct poptOption long_options[] 
+@@ -384,6 +393,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 },
-   {"address",          0,  POPT_ARG_STRING, &bind_address, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
 +  {"delete-dir",       0,  POPT_ARG_STRING, &delete_dir, 0, 0, 0 },
    {"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 },
-@@ -733,6 +743,8 @@ int parse_arguments(int *argc, const cha
+   {"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);
  		if (backup_dir)
  			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
@@ -168,7 +168,7 @@ Marc St-Onge
  		if (files_from)
  			files_from = sanitize_path(NULL, files_from, NULL, 0);
  	}
-@@ -758,6 +770,12 @@ int parse_arguments(int *argc, const cha
+@@ -821,6 +833,12 @@ int parse_arguments(int *argc, const cha
  			if (check_exclude(elp, backup_dir, 1) < 0)
  				goto options_rejected;
  		}
@@ -181,7 +181,7 @@ Marc St-Onge
  	}
  	if (server_exclude_list.head && files_from) {
  		clean_fname(files_from, 1);
-@@ -784,6 +802,16 @@ int parse_arguments(int *argc, const cha
+@@ -841,6 +859,16 @@ int parse_arguments(int *argc, const cha
  			backup_suffix);
  		return 0;
  	}
@@ -198,7 +198,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;
-@@ -803,6 +831,31 @@ int parse_arguments(int *argc, const cha
+@@ -860,6 +888,31 @@ int parse_arguments(int *argc, const cha
  			"--suffix cannot be a null string without --backup-dir\n");
  		return 0;
  	}
@@ -230,7 +230,7 @@ Marc St-Onge
  
  	if (do_progress && !verbose)
  		verbose = 1;
-@@ -1005,6 +1058,10 @@ void server_options(char **args,int *arg
+@@ -1066,6 +1119,10 @@ void server_options(char **args,int *arg
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
@@ -241,7 +241,7 @@ Marc St-Onge
  
  	/* Only send --suffix if it specifies a non-default value. */
  	if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1013,7 +1070,13 @@ void server_options(char **args,int *arg
+@@ -1074,7 +1131,13 @@ void server_options(char **args,int *arg
  			goto oom;
  		args[ac++] = arg;
  	}
@@ -256,9 +256,9 @@ Marc St-Onge
  	if (am_sender) {
  		if (delete_excluded)
  			args[ac++] = "--delete-excluded";
---- orig/receiver.c	2004-09-21 09:40:27
-+++ receiver.c	2004-09-22 02:09:20
-@@ -42,8 +42,11 @@ extern char *compare_dest;
+--- 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;
@@ -270,7 +270,7 @@ Marc St-Onge
  extern int cleanup_got_literal;
  extern int module_id;
  extern int ignore_errors;
-@@ -77,11 +80,14 @@ static void delete_one(char *fn, int is_
+@@ -78,11 +81,14 @@ static void delete_one(char *fn, int is_
  	}
  }
  
@@ -287,18 +287,19 @@ Marc St-Onge
  }
  
  
-@@ -122,10 +128,11 @@ void delete_files(struct file_list *flis
- 				continue;
+@@ -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]);
--				if (make_backups && (backup_dir || !is_backup_file(f))) {
--					make_backup(f);
+ 				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)) {
++				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 {
+ 				} else