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

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 202b844..5592699 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -13,7 +13,7 @@ suffix.
 
 Marc St-Onge
 
---- orig/backup.c	2005-02-22 01:57:58
+--- orig/backup.c	2005-11-10 16:58:36
 +++ backup.c	2005-02-22 02:11:15
 @@ -22,11 +22,17 @@
  
@@ -92,7 +92,7 @@ Marc St-Onge
  		return 0;
  
  	/* Check to see if this is a device file, or link */
-@@ -277,3 +304,13 @@ int make_backup(char *fname)
+@@ -278,3 +305,13 @@ int make_backup(char *fname)
  		return keep_backup(fname);
  	return make_simple_backup(fname);
  }
@@ -106,9 +106,9 @@ Marc St-Onge
 +	deleting = 0;
 +	return ret;
 +}
---- orig/generator.c	2005-04-28 16:26:28
-+++ generator.c	2005-03-11 11:22:38
-@@ -86,6 +86,9 @@ extern dev_t filesystem_dev;
+--- orig/generator.c	2005-11-12 20:31:04
++++ generator.c	2005-11-15 07:02:12
+@@ -89,6 +89,9 @@ extern dev_t filesystem_dev;
  extern char *backup_dir;
  extern char *backup_suffix;
  extern int backup_suffix_len;
@@ -118,8 +118,8 @@ Marc St-Onge
  extern struct file_list *the_file_list;
  extern struct filter_list_struct server_filter_list;
  
-@@ -94,10 +97,14 @@ int allowed_lull = 0;
- static int deletion_count = 0; /* used to implement --max-delete */
+@@ -99,10 +102,14 @@ static int deletion_count = 0; /* used t
+ #define DEL_TERSE		(1<<3)
  
  
 +/* Function now compares both backup_suffix and backup_suffix_dels. */
@@ -134,7 +134,7 @@ Marc St-Onge
  }
  
  
-@@ -114,8 +121,8 @@ static int delete_item(char *fname, int 
+@@ -123,8 +130,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) {
-@@ -138,9 +145,9 @@ static int delete_item(char *fname, int 
+@@ -146,9 +153,9 @@ static int delete_item(char *fname, int 
  	    || (dry_run && zap_dir)) {
  		ok = 0;
  		errno = ENOTEMPTY;
@@ -157,9 +157,9 @@ Marc St-Onge
  	else
  		ok = do_rmdir(fname) == 0;
  	if (ok) {
---- orig/options.c	2005-05-03 16:47:32
-+++ options.c	2005-03-01 01:25:39
-@@ -128,10 +128,14 @@ int no_detach
+--- orig/options.c	2005-11-15 18:21:22
++++ options.c	2005-11-07 04:35:54
+@@ -132,10 +132,14 @@ int no_detach
  int write_batch = 0;
  int read_batch = 0;
  int backup_dir_len = 0;
@@ -174,17 +174,17 @@ Marc St-Onge
  char *tmpdir = NULL;
  char *partial_dir = NULL;
  char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -141,7 +145,9 @@ char *log_format = NULL;
- char *password_file = NULL;
+@@ -146,7 +150,9 @@ 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;
-@@ -272,6 +278,8 @@ void usage(enum logcode F)
+@@ -279,6 +285,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);
@@ -192,24 +192,18 @@ Marc St-Onge
 +  rprintf(F,"     --suffix-dels=SUFFIX    set removed-files suffix (defaults to --suffix)\n");
    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," -d, --dirs                  transfer directories without recursing\n");
-@@ -371,6 +379,7 @@ static struct poptOption long_options[] 
-   /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-   {"version",          0,  POPT_ARG_NONE,   0, OPT_VERSION, 0, 0},
-   {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-+  {"suffix-dels",      0,  POPT_ARG_STRING, &backup_suffix_dels, 0, 0, 0 },
-   {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
-   {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
-   {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
-@@ -452,6 +461,7 @@ static struct poptOption long_options[] 
-   {"itemize-changes", 'i', POPT_ARG_NONE,   &itemize_changes, 0, 0, 0 },
+   rprintf(F,"     --append                append data onto shorter files\n");
+@@ -478,7 +486,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 },
 +  {"backup-dir-dels",  0,  POPT_ARG_STRING, &backup_dir_dels, 0, 0, 0 },
-   {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 0, 0 },
+   {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
++  {"suffix-dels",      0,  POPT_ARG_STRING, &backup_suffix_dels, 0, 0, 0 },
+   {"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 },
-@@ -1027,6 +1037,8 @@ int parse_arguments(int *argc, const cha
+@@ -1142,6 +1152,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);
@@ -218,7 +212,7 @@ Marc St-Onge
  	}
  	if (server_filter_list.head && !am_sender) {
  		struct filter_list_struct *elp = &server_filter_list;
-@@ -1061,6 +1073,14 @@ int parse_arguments(int *argc, const cha
+@@ -1176,6 +1188,14 @@ int parse_arguments(int *argc, const cha
  				return 0;
  			}
  		}
@@ -233,7 +227,7 @@ Marc St-Onge
  	}
  
  	if (!backup_suffix)
-@@ -1072,6 +1092,16 @@ int parse_arguments(int *argc, const cha
+@@ -1187,6 +1207,16 @@ int parse_arguments(int *argc, const cha
  			backup_suffix);
  		return 0;
  	}
@@ -250,7 +244,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;
-@@ -1093,6 +1123,31 @@ int parse_arguments(int *argc, const cha
+@@ -1208,6 +1238,31 @@ int parse_arguments(int *argc, const cha
  			"--suffix cannot be a null string without --backup-dir\n");
  		return 0;
  	}
@@ -282,18 +276,18 @@ Marc St-Onge
  	if (make_backups && !backup_dir)
  		omit_dir_times = 1;
  
-@@ -1373,6 +1428,10 @@ void server_options(char **args,int *arg
+@@ -1530,6 +1585,10 @@ void server_options(char **args,int *arg
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
-+	if (backup_dir_dels) {
++	if (backup_dir_dels && backup_dir_dels != backup_dir) {
 +		args[ac++] = "--backup-dir-dels";
 +		args[ac++] = backup_dir_dels;
 +	}
  
  	/* Only send --suffix if it specifies a non-default value. */
  	if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1381,7 +1440,13 @@ void server_options(char **args,int *arg
+@@ -1538,7 +1597,13 @@ void server_options(char **args,int *arg
  			goto oom;
  		args[ac++] = arg;
  	}