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

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 3b1282e..e67ba21 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -19,7 +19,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
 diff --git a/backup.c b/backup.c
 --- a/backup.c
 +++ b/backup.c
@@ -230,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 },
-@@ -1991,6 +2001,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2006,6 +2016,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);
@@ -239,7 +239,7 @@ diff --git a/options.c b/options.c
  	}
  	if (daemon_filter_list.head && !am_sender) {
  		filter_rule_list *elp = &daemon_filter_list;
-@@ -2012,6 +2024,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2027,6 +2039,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  			if (check_filter(elp, FLOG, dir, 1) < 0)
  				goto options_rejected;
  		}
@@ -254,7 +254,7 @@ diff --git a/options.c b/options.c
  	}
  
  	if (!backup_suffix)
-@@ -2023,6 +2043,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2038,6 +2058,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  			backup_suffix);
  		return 0;
  	}
@@ -275,7 +275,7 @@ diff --git a/options.c b/options.c
  	if (backup_dir) {
  		while (*backup_dir == '.' && backup_dir[1] == '/')
  			backup_dir += 2;
-@@ -2056,6 +2090,34 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2071,6 +2105,34 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  			"P *%s", backup_suffix);
  		parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
  	}
@@ -310,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. */
-@@ -2469,6 +2531,10 @@ void server_options(char **args, int *argc_p)
+@@ -2484,6 +2546,10 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
@@ -321,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) {
-@@ -2477,7 +2543,14 @@ void server_options(char **args, int *argc_p)
+@@ -2492,7 +2558,14 @@ void server_options(char **args, int *argc_p)
  			goto oom;
  		args[ac++] = arg;
  	}