X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/d42637db2cd0a3c07096b8584f48f67abcaf6dfa..0461b869d0800656bf41722c1a68800e728e45e5:/backup-dir-dels.diff

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 842fe6b..51b71cf 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -13,9 +13,15 @@ suffix.
 
 Marc St-Onge
 
+To use this patch, run these commands for a successful build:
+
+    patch -p1 <patches/backup-dir-dels.diff
+    ./configure                                 (optional if already run)
+    make
+
 --- old/backup.c
 +++ new/backup.c
-@@ -22,10 +22,15 @@
+@@ -23,10 +23,15 @@
  
  extern int verbose;
  extern int backup_dir_len;
@@ -31,7 +37,7 @@ Marc St-Onge
  
  extern int am_root;
  extern int preserve_devices;
-@@ -33,6 +38,8 @@ extern int preserve_specials;
+@@ -34,6 +39,8 @@ extern int preserve_specials;
  extern int preserve_links;
  extern int safe_symlinks;
  
@@ -40,7 +46,7 @@ Marc St-Onge
  /* make a complete pathname for backup file */
  char *get_backup_name(char *fname)
  {
-@@ -50,11 +57,28 @@ char *get_backup_name(char *fname)
+@@ -51,11 +58,28 @@ char *get_backup_name(char *fname)
  	return NULL;
  }
  
@@ -70,7 +76,7 @@ Marc St-Onge
  
  	if (!fnamebak)
  		return 0;
-@@ -94,7 +118,8 @@ path
+@@ -95,7 +119,8 @@ path
  static int make_bak_dir(char *fullpath)
  {
  	STRUCT_STAT st;
@@ -80,7 +86,7 @@ Marc St-Onge
  	char *end = rel + strlen(rel);
  	char *p = end;
  
-@@ -182,7 +207,8 @@ static int keep_backup(char *fname)
+@@ -183,7 +208,8 @@ static int keep_backup(char *fname)
  	if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
  		return 1; /* the file could have disappeared */
  
@@ -90,7 +96,7 @@ Marc St-Onge
  		return 0;
  
  	/* Check to see if this is a device file, or link */
-@@ -277,3 +303,13 @@ int make_backup(char *fname)
+@@ -278,3 +304,13 @@ int make_backup(char *fname)
  		return keep_backup(fname);
  	return make_simple_backup(fname);
  }
@@ -116,7 +122,7 @@ Marc St-Onge
  extern struct file_list *the_file_list;
  extern struct filter_list_struct server_filter_list;
  
-@@ -102,10 +105,14 @@ static int can_link_devices = 1;
+@@ -100,10 +103,14 @@ static int deletion_count = 0; /* used t
  #define DEL_TERSE		(1<<3)
  
  
@@ -132,7 +138,7 @@ Marc St-Onge
  }
  
  
-@@ -126,8 +133,8 @@ static int delete_item(char *fname, int 
+@@ -124,8 +131,8 @@ static int delete_item(char *fname, int 
  	if (!S_ISDIR(mode)) {
  		if (max_delete && ++deletion_count > max_delete)
  			return 0;
@@ -143,7 +149,7 @@ Marc St-Onge
  		else
  			ok = robust_unlink(fname) == 0;
  		if (ok) {
-@@ -149,9 +156,9 @@ static int delete_item(char *fname, int 
+@@ -147,9 +154,9 @@ static int delete_item(char *fname, int 
  	    || (dry_run && zap_dir)) {
  		ok = 0;
  		errno = ENOTEMPTY;
@@ -172,7 +178,7 @@ Marc St-Onge
  char *tmpdir = NULL;
  char *partial_dir = NULL;
  char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -151,7 +155,9 @@ char *log_format = NULL;
+@@ -153,7 +157,9 @@ char *stdout_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
@@ -182,7 +188,7 @@ Marc St-Onge
  char *sockopts = NULL;
  int rsync_port = 0;
  int compare_dest = 0;
-@@ -282,6 +288,8 @@ void usage(enum logcode F)
+@@ -292,6 +298,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);
@@ -191,7 +197,7 @@ Marc St-Onge
    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");
-@@ -497,7 +505,9 @@ static struct poptOption long_options[] 
+@@ -518,7 +526,9 @@ static struct poptOption long_options[] 
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
@@ -201,16 +207,16 @@ Marc St-Onge
    {"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 },
-@@ -1212,6 +1222,8 @@ int parse_arguments(int *argc, const cha
- 			partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
+@@ -1232,6 +1242,8 @@ int parse_arguments(int *argc, const cha
+ 			tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
  		if (backup_dir)
- 			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
-+		if (backup_dir_dels)							
-+			backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0);
+ 			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL);
++		if (backup_dir_dels)
++			backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, NULL);
  	}
  	if (server_filter_list.head && !am_sender) {
  		struct filter_list_struct *elp = &server_filter_list;
-@@ -1246,6 +1258,14 @@ int parse_arguments(int *argc, const cha
+@@ -1253,6 +1265,14 @@ int parse_arguments(int *argc, const cha
  				return 0;
  			}
  		}
@@ -225,7 +231,7 @@ Marc St-Onge
  	}
  
  	if (!backup_suffix)
-@@ -1257,6 +1277,16 @@ int parse_arguments(int *argc, const cha
+@@ -1264,6 +1284,16 @@ int parse_arguments(int *argc, const cha
  			backup_suffix);
  		return 0;
  	}
@@ -242,7 +248,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;
-@@ -1280,6 +1310,31 @@ int parse_arguments(int *argc, const cha
+@@ -1287,6 +1317,31 @@ int parse_arguments(int *argc, const cha
  			"P *%s", backup_suffix);
  		parse_rule(&filter_list, backup_dir_buf, 0, 0);
  	}
@@ -274,7 +280,7 @@ Marc St-Onge
  	if (make_backups && !backup_dir)
  		omit_dir_times = 1;
  
-@@ -1624,6 +1679,10 @@ void server_options(char **args,int *arg
+@@ -1646,6 +1701,10 @@ void server_options(char **args,int *arg
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
@@ -285,7 +291,7 @@ Marc St-Onge
  
  	/* Only send --suffix if it specifies a non-default value. */
  	if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1632,7 +1691,13 @@ void server_options(char **args,int *arg
+@@ -1654,7 +1713,13 @@ void server_options(char **args,int *arg
  			goto oom;
  		args[ac++] = arg;
  	}