X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/cc3e685d09b2095099fc396157d19172ab3ef7c4..a5e6228afbf1809d33d9a31e0895c5e955c39ce1:/backup-dir-dels.diff

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 64c2f5e..7198018 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -106,7 +106,7 @@ diff --git a/backup.c b/backup.c
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
-@@ -94,6 +94,9 @@ extern mode_t orig_umask;
+@@ -95,6 +95,9 @@ extern uid_t our_uid;
  extern char *backup_dir;
  extern char *backup_suffix;
  extern int backup_suffix_len;
@@ -116,10 +116,11 @@ diff --git a/generator.c b/generator.c
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  extern struct filter_list_struct server_filter_list;
  
-@@ -128,10 +131,14 @@ enum delret {
+@@ -136,10 +139,15 @@ enum delret {
+ /* Forward declaration for delete_item(). */
  static enum delret delete_dir_contents(char *fname, int flags);
  
- 
++
 +/* Function now compares both backup_suffix and backup_suffix_dels. */
  static int is_backup_file(char *fn)
  {
@@ -132,7 +133,7 @@ diff --git a/generator.c b/generator.c
  }
  
  /* Delete a file or directory.  If DEL_RECURSE is set in the flags, this will
-@@ -167,9 +174,9 @@ static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
+@@ -178,9 +186,9 @@ static enum delret delete_item(char *fbuf, int mode, int flags)
  	if (S_ISDIR(mode)) {
  		what = "rmdir";
  		ok = do_rmdir(fbuf) == 0;
@@ -147,7 +148,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -148,10 +148,14 @@ int no_detach
+@@ -149,10 +149,14 @@ int no_detach
  int write_batch = 0;
  int read_batch = 0;
  int backup_dir_len = 0;
@@ -162,7 +163,7 @@ diff --git a/options.c b/options.c
  char *tmpdir = NULL;
  char *partial_dir = NULL;
  char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -163,7 +167,9 @@ char *stdout_format = NULL;
+@@ -164,7 +168,9 @@ char *stdout_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
@@ -172,7 +173,7 @@ diff --git a/options.c b/options.c
  char *sockopts = NULL;
  int rsync_port = 0;
  int compare_dest = 0;
-@@ -319,6 +325,8 @@ void usage(enum logcode F)
+@@ -320,6 +326,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);
@@ -181,7 +182,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");
-@@ -590,7 +598,9 @@ static struct poptOption long_options[] = {
+@@ -591,7 +599,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 },
@@ -191,7 +192,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 },
-@@ -1402,6 +1412,8 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
+@@ -1405,6 +1415,8 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
  			tmpdir = sanitize_path(NULL, tmpdir, NULL, 0);
  		if (backup_dir)
  			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
@@ -200,8 +201,8 @@ diff --git a/options.c b/options.c
  	}
  	if (server_filter_list.head && !am_sender) {
  		struct filter_list_struct *elp = &server_filter_list;
-@@ -1419,6 +1431,14 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
- 			if (check_filter(elp, backup_dir, 1) < 0)
+@@ -1426,6 +1438,14 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
+ 			if (check_filter(elp, dir, 1) < 0)
  				goto options_rejected;
  		}
 +		/* Clean backup_dir_dels same as for backup_dir */
@@ -215,13 +216,12 @@ diff --git a/options.c b/options.c
  	}
  
  	if (!backup_suffix)
-@@ -1430,6 +1450,16 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
+@@ -1437,6 +1457,15 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
  			backup_suffix);
  		return 0;
  	}
-+	/* if backup_suffix_dels not supplied, default to backup_suffix */
 +	if (!backup_suffix_dels)
-+		backup_suffix_dels = backup_dir_dels ? "" : backup_suffix;
++		backup_suffix_dels = backup_dir_dels && !am_server ? "" : backup_suffix;
 +	backup_suffix_dels_len = strlen(backup_suffix_dels);
 +	if (strchr(backup_suffix_dels, '/') != NULL) {
 +		snprintf(err_buf, sizeof err_buf,
@@ -232,17 +232,11 @@ diff --git a/options.c b/options.c
  	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;
-@@ -1453,6 +1483,31 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
+@@ -1460,6 +1489,30 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
  			"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) {
-+		backup_dir_dels = backup_dir;
-+		backup_dir_dels_len = backup_dir_len;
-+		backup_dir_dels_remainder = backup_dir_remainder;
-+		strlcpy(backup_dir_dels_buf, backup_dir_buf, sizeof backup_dir_buf);
-+	} else if (backup_dir_dels) {
++	if (backup_dir_dels) {
 +		backup_dir_dels_len = strlcpy(backup_dir_dels_buf, backup_dir_dels, sizeof backup_dir_dels_buf);
 +		backup_dir_dels_remainder = sizeof backup_dir_dels_buf - backup_dir_dels_len;
 +		if (backup_dir_dels_remainder < 32) {
@@ -256,6 +250,11 @@ diff --git a/options.c b/options.c
 +		}
 +		if (verbose > 1 && !am_sender)
 +			rprintf(FINFO, "backup_dir_dels is %s\n", backup_dir_dels_buf);
++	} else if (backup_dir) {
++		backup_dir_dels = backup_dir;
++		backup_dir_dels_len = backup_dir_len;
++		backup_dir_dels_remainder = backup_dir_remainder;
++		strlcpy(backup_dir_dels_buf, backup_dir_buf, sizeof backup_dir_buf);
 +	} else if (!backup_suffix_dels_len && (!am_server || !am_sender)) {
 +		snprintf(err_buf, sizeof err_buf,
 +			"--suffix-dels cannot be a null string without --backup-dir-dels\n");
@@ -264,7 +263,7 @@ diff --git a/options.c b/options.c
  
  	if (make_backups && !backup_dir) {
  		omit_dir_times = 0; /* Implied, so avoid -O to sender. */
-@@ -1844,6 +1899,10 @@ void server_options(char **args, int *argc_p)
+@@ -1853,6 +1906,10 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
@@ -275,13 +274,14 @@ 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) {
-@@ -1852,7 +1911,13 @@ void server_options(char **args, int *argc_p)
+@@ -1861,7 +1918,14 @@ void server_options(char **args, int *argc_p)
  			goto oom;
  		args[ac++] = arg;
  	}
 -
-+	/* Only send --suffix-dels if it specifies a non-default value. */
-+	if (strcmp(backup_suffix_dels, backup_dir_dels ? "" : BACKUP_SUFFIX) != 0) {
++	/* Only send --suffix-dels if it specifies a value different from the
++	 * --suffix value, which would normally be used for deletions too. */
++	if (strcmp(backup_suffix_dels, backup_suffix) != 0) {
 +		/* We use the following syntax to avoid weirdness with '~'. */
 +		if (asprintf(&arg, "--suffix-dels=%s", backup_suffix_dels) < 0)
 +			goto oom;