X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/9c657c9f32a0016e17e5b0b90aa90eded1611e90..e0e47893064c8fd38b96bec679416b3e562df485:/backup-dir-dels.diff

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 5592699..995ee55 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -13,7 +13,7 @@ suffix.
 
 Marc St-Onge
 
---- orig/backup.c	2005-11-10 16:58:36
+--- orig/backup.c	2006-01-20 21:12:21
 +++ backup.c	2005-02-22 02:11:15
 @@ -22,11 +22,17 @@
  
@@ -72,7 +72,7 @@ Marc St-Onge
  
  	if (!fnamebak)
  		return 0;
-@@ -97,7 +122,8 @@ path
+@@ -96,7 +121,8 @@ path
  static int make_bak_dir(char *fullpath)
  {
  	STRUCT_STAT st;
@@ -82,8 +82,8 @@ Marc St-Onge
  	char *end = rel + strlen(rel);
  	char *p = end;
  
-@@ -184,7 +210,8 @@ static int keep_backup(char *fname)
- 	if (!(file = make_file(fname, NULL, NO_FILTERS)))
+@@ -183,7 +209,8 @@ static int keep_backup(char *fname)
+ 	if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
  		return 1; /* the file could have disappeared */
  
 -	if (!(buf = get_backup_name(fname)))
@@ -92,7 +92,7 @@ Marc St-Onge
  		return 0;
  
  	/* Check to see if this is a device file, or link */
-@@ -278,3 +305,13 @@ int make_backup(char *fname)
+@@ -277,3 +304,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/generator.c	2005-11-12 20:31:04
+--- orig/generator.c	2006-01-20 21:12:17
 +++ generator.c	2005-11-15 07:02:12
 @@ -89,6 +89,9 @@ extern dev_t filesystem_dev;
  extern char *backup_dir;
@@ -118,7 +118,7 @@ Marc St-Onge
  extern struct file_list *the_file_list;
  extern struct filter_list_struct server_filter_list;
  
-@@ -99,10 +102,14 @@ static int deletion_count = 0; /* used t
+@@ -101,10 +104,14 @@ static int can_link_devices = 1;
  #define DEL_TERSE		(1<<3)
  
  
@@ -134,7 +134,7 @@ Marc St-Onge
  }
  
  
-@@ -123,8 +130,8 @@ static int delete_item(char *fname, int 
+@@ -125,8 +132,8 @@ static int delete_item(char *fname, int 
  	if (!S_ISDIR(mode)) {
  		if (max_delete && ++deletion_count > max_delete)
  			return 0;
@@ -145,7 +145,7 @@ Marc St-Onge
  		else
  			ok = robust_unlink(fname) == 0;
  		if (ok) {
-@@ -146,9 +153,9 @@ static int delete_item(char *fname, int 
+@@ -148,9 +155,9 @@ static int delete_item(char *fname, int 
  	    || (dry_run && zap_dir)) {
  		ok = 0;
  		errno = ENOTEMPTY;
@@ -157,8 +157,8 @@ Marc St-Onge
  	else
  		ok = do_rmdir(fname) == 0;
  	if (ok) {
---- orig/options.c	2005-11-15 18:21:22
-+++ options.c	2005-11-07 04:35:54
+--- orig/options.c	2006-01-21 07:55:00
++++ options.c	2006-01-21 08:05:44
 @@ -132,10 +132,14 @@ int no_detach
  int write_batch = 0;
  int read_batch = 0;
@@ -174,17 +174,17 @@ Marc St-Onge
  char *tmpdir = NULL;
  char *partial_dir = NULL;
  char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -146,7 +150,9 @@ char *password_file = NULL;
+@@ -145,7 +149,9 @@ char *log_format = NULL;
+ char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
- char *chmod_mode = NULL;
 +char *backup_dir_dels = NULL;
  char backup_dir_buf[MAXPATHLEN];
 +char backup_dir_dels_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;
  int copy_dest = 0;
-@@ -279,6 +285,8 @@ void usage(enum logcode F)
+@@ -276,6 +282,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);
@@ -193,7 +193,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");
-@@ -478,7 +486,9 @@ static struct poptOption long_options[] 
+@@ -475,7 +483,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 },
@@ -203,7 +203,7 @@ 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 },
-@@ -1142,6 +1152,8 @@ int parse_arguments(int *argc, const cha
+@@ -1147,6 +1157,8 @@ int parse_arguments(int *argc, const cha
  			partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
  		if (backup_dir)
  			backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
@@ -212,7 +212,7 @@ Marc St-Onge
  	}
  	if (server_filter_list.head && !am_sender) {
  		struct filter_list_struct *elp = &server_filter_list;
-@@ -1176,6 +1188,14 @@ int parse_arguments(int *argc, const cha
+@@ -1181,6 +1193,14 @@ int parse_arguments(int *argc, const cha
  				return 0;
  			}
  		}
@@ -227,7 +227,7 @@ Marc St-Onge
  	}
  
  	if (!backup_suffix)
-@@ -1187,6 +1207,16 @@ int parse_arguments(int *argc, const cha
+@@ -1192,6 +1212,16 @@ int parse_arguments(int *argc, const cha
  			backup_suffix);
  		return 0;
  	}
@@ -244,9 +244,9 @@ 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;
-@@ -1208,6 +1238,31 @@ int parse_arguments(int *argc, const cha
- 			"--suffix cannot be a null string without --backup-dir\n");
- 		return 0;
+@@ -1215,6 +1245,31 @@ int parse_arguments(int *argc, const cha
+ 			"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) {
@@ -276,7 +276,7 @@ Marc St-Onge
  	if (make_backups && !backup_dir)
  		omit_dir_times = 1;
  
-@@ -1530,6 +1585,10 @@ void server_options(char **args,int *arg
+@@ -1544,6 +1599,10 @@ void server_options(char **args,int *arg
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
@@ -287,7 +287,7 @@ Marc St-Onge
  
  	/* Only send --suffix if it specifies a non-default value. */
  	if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1538,7 +1597,13 @@ void server_options(char **args,int *arg
+@@ -1552,7 +1611,13 @@ void server_options(char **args,int *arg
  			goto oom;
  		args[ac++] = arg;
  	}