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

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index a724472..64c2f5e 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -19,8 +19,9 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
---- old/backup.c
-+++ new/backup.c
+diff --git a/backup.c b/backup.c
+--- a/backup.c
++++ b/backup.c
 @@ -29,10 +29,17 @@ extern int preserve_specials;
  extern int preserve_links;
  extern int safe_symlinks;
@@ -78,7 +79,7 @@ To use this patch, run these commands for a successful build:
  	stat_x sx;
  
  	while (*fullpath == '.' && fullpath[1] == '/') {
-@@ -211,7 +235,8 @@ static int keep_backup(const char *fname
+@@ -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 */
  
@@ -102,9 +103,10 @@ To use this patch, run these commands for a successful build:
 +	deleting = 0;
 +	return ret;
 +}
---- old/generator.c
-+++ new/generator.c
-@@ -93,6 +93,9 @@ extern mode_t orig_umask;
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -94,6 +94,9 @@ extern mode_t orig_umask;
  extern char *backup_dir;
  extern char *backup_suffix;
  extern int backup_suffix_len;
@@ -113,8 +115,8 @@ To use this patch, run these commands for a successful build:
 +extern int backup_suffix_dels_len;
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  extern struct filter_list_struct server_filter_list;
- #ifdef ICONV_OPTION
-@@ -130,10 +133,14 @@ enum delret {
+ 
+@@ -128,10 +131,14 @@ enum delret {
  static enum delret delete_dir_contents(char *fname, int flags);
  
  
@@ -130,7 +132,7 @@ To use this patch, run these commands for a successful build:
  }
  
  /* 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
+@@ -167,9 +174,9 @@ static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
  	if (S_ISDIR(mode)) {
  		what = "rmdir";
  		ok = do_rmdir(fbuf) == 0;
@@ -142,9 +144,10 @@ To use this patch, run these commands for a successful build:
  	} else {
  		what = "unlink";
  		ok = robust_unlink(fbuf) == 0;
---- old/options.c
-+++ new/options.c
-@@ -147,10 +147,14 @@ int no_detach
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -148,10 +148,14 @@ int no_detach
  int write_batch = 0;
  int read_batch = 0;
  int backup_dir_len = 0;
@@ -159,7 +162,7 @@ To use this patch, run these commands for a successful build:
  char *tmpdir = NULL;
  char *partial_dir = NULL;
  char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -162,7 +166,9 @@ char *stdout_format = NULL;
+@@ -163,7 +167,9 @@ char *stdout_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
@@ -169,7 +172,7 @@ To use this patch, run these commands for a successful build:
  char *sockopts = NULL;
  int rsync_port = 0;
  int compare_dest = 0;
-@@ -318,6 +324,8 @@ void usage(enum logcode F)
+@@ -319,6 +325,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);
@@ -178,7 +181,7 @@ To use this patch, run these commands for a successful build:
    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");
-@@ -588,7 +596,9 @@ static struct poptOption long_options[] 
+@@ -590,7 +598,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 },
@@ -188,16 +191,16 @@ To use this patch, run these commands for a successful build:
    {"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 },
-@@ -1400,6 +1410,8 @@ int parse_arguments(int *argc_p, const c
- 			tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
+@@ -1402,6 +1412,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, NULL);
+ 			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
 +		if (backup_dir_dels)
-+			backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, NULL);
++			backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0);
  	}
  	if (server_filter_list.head && !am_sender) {
  		struct filter_list_struct *elp = &server_filter_list;
-@@ -1417,6 +1429,14 @@ int parse_arguments(int *argc_p, const c
+@@ -1419,6 +1431,14 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
  			if (check_filter(elp, backup_dir, 1) < 0)
  				goto options_rejected;
  		}
@@ -212,7 +215,7 @@ To use this patch, run these commands for a successful build:
  	}
  
  	if (!backup_suffix)
-@@ -1428,6 +1448,16 @@ int parse_arguments(int *argc_p, const c
+@@ -1430,6 +1450,16 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
  			backup_suffix);
  		return 0;
  	}
@@ -229,7 +232,7 @@ To use this patch, run these commands for a successful build:
  	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;
-@@ -1451,6 +1481,31 @@ int parse_arguments(int *argc_p, const c
+@@ -1453,6 +1483,31 @@ 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);
  	}
@@ -261,7 +264,7 @@ To use this patch, run these commands for a successful build:
  
  	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
+@@ -1844,6 +1899,10 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
@@ -272,7 +275,7 @@ To use this patch, run these commands for a successful build:
  
  	/* Only send --suffix if it specifies a non-default value. */
  	if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1853,7 +1912,13 @@ void server_options(char **args, int *ar
+@@ -1852,7 +1911,13 @@ void server_options(char **args, int *argc_p)
  			goto oom;
  		args[ac++] = arg;
  	}