X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/03019e41fc3299020c8acdda06cf57a1e2c57a25..83f570e408ddff247cfd552855418d844da833e7:/backup-dir-dels.diff

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 51b71cf..29fb760 100644
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -44,13 +44,13 @@ To use this patch, run these commands for a successful build:
 +static int deleting;
 +
  /* make a complete pathname for backup file */
- char *get_backup_name(char *fname)
+ char *get_backup_name(const char *fname)
  {
-@@ -51,11 +58,28 @@ char *get_backup_name(char *fname)
+@@ -51,11 +58,28 @@ char *get_backup_name(const char *fname)
  	return NULL;
  }
  
-+static char *get_delete_name(char *fname)
++static char *get_delete_name(const char *fname)
 +{
 +	if (backup_dir_dels) {
 +		if (stringjoin(backup_dir_dels_buf + backup_dir_dels_len, backup_dir_dels_remainder,
@@ -67,12 +67,12 @@ To use this patch, run these commands for a successful build:
 +}
 +
  /* simple backup creates a backup with a suffix in the same directory */
- static int make_simple_backup(char *fname)
+ static int make_simple_backup(const char *fname)
  {
  	int rename_errno;
--	char *fnamebak = get_backup_name(fname);
-+	char *fnamebak = deleting ? get_delete_name(fname)
-+				  : get_backup_name(fname);
+-	const char *fnamebak = get_backup_name(fname);
++	const char *fnamebak = deleting ? get_delete_name(fname)
++					: get_backup_name(fname);
  
  	if (!fnamebak)
  		return 0;
@@ -86,7 +86,7 @@ To use this patch, run these commands for a successful build:
  	char *end = rel + strlen(rel);
  	char *p = end;
  
-@@ -183,7 +208,8 @@ static int keep_backup(char *fname)
+@@ -185,7 +210,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 */
  
@@ -96,7 +96,7 @@ To use this patch, run these commands for a successful build:
  		return 0;
  
  	/* Check to see if this is a device file, or link */
-@@ -278,3 +304,13 @@ int make_backup(char *fname)
+@@ -280,3 +306,13 @@ int make_backup(const char *fname)
  		return keep_backup(fname);
  	return make_simple_backup(fname);
  }
@@ -122,8 +122,8 @@ To use this patch, run these commands for a successful build:
  extern struct file_list *the_file_list;
  extern struct filter_list_struct server_filter_list;
  
-@@ -100,10 +103,14 @@ static int deletion_count = 0; /* used t
- #define DEL_TERSE		(1<<3)
+@@ -115,10 +118,14 @@ enum delret {
+ static enum delret delete_dir_contents(char *fname, int flags);
  
  
 +/* Function now compares both backup_suffix and backup_suffix_dels. */
@@ -137,30 +137,19 @@ To use this patch, run these commands for a successful build:
 +	return k > 0 && strcmp(fn+k, backup_suffix_dels) == 0;
  }
  
- 
-@@ -124,8 +131,8 @@ static int delete_item(char *fname, int 
- 	if (!S_ISDIR(mode)) {
- 		if (max_delete && ++deletion_count > max_delete)
- 			return 0;
--		if (make_backups && (backup_dir || !is_backup_file(fname)))
--			ok = make_backup(fname);
-+		if (make_backups && (backup_dir_dels || !is_backup_file(fname)))
-+			ok = safe_delete(fname);
- 		else
- 			ok = robust_unlink(fname) == 0;
- 		if (ok) {
-@@ -147,9 +154,9 @@ static int delete_item(char *fname, int 
- 	    || (dry_run && zap_dir)) {
- 		ok = 0;
- 		errno = ENOTEMPTY;
--	} else if (make_backups && !backup_dir && !is_backup_file(fname)
-+	} else if (make_backups && !backup_dir_dels && !is_backup_file(fname)
- 	    && !(flags & DEL_FORCE_RECURSE))
--		ok = make_backup(fname);
-+		ok = safe_delete(fname);
- 	else
- 		ok = do_rmdir(fname) == 0;
- 	if (ok) {
+ /* Delete a file or directory.  If DEL_RECURSE is set in the flags, this will
+@@ -154,9 +161,9 @@ static enum delret delete_item(char *fbu
+ 	if (S_ISDIR(mode)) {
+ 		what = "rmdir";
+ 		ok = do_rmdir(fbuf) == 0;
+-	} else if (make_backups && (backup_dir || !is_backup_file(fbuf))) {
++	} else if (make_backups && (backup_dir_dels || !is_backup_file(fbuf))) {
+ 		what = "make_backup";
+-		ok = make_backup(fbuf);
++		ok = safe_delete(fbuf);
+ 	} else {
+ 		what = "unlink";
+ 		ok = robust_unlink(fbuf) == 0;
 --- old/options.c
 +++ new/options.c
 @@ -138,10 +138,14 @@ int no_detach
@@ -188,7 +177,7 @@ To use this patch, run these commands for a successful build:
  char *sockopts = NULL;
  int rsync_port = 0;
  int compare_dest = 0;
-@@ -292,6 +298,8 @@ void usage(enum logcode F)
+@@ -288,6 +294,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);
@@ -197,7 +186,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");
-@@ -518,7 +526,9 @@ static struct poptOption long_options[] 
+@@ -516,7 +524,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 },
@@ -207,7 +196,7 @@ 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 },
-@@ -1232,6 +1242,8 @@ int parse_arguments(int *argc, const cha
+@@ -1230,6 +1240,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, NULL);
@@ -216,9 +205,9 @@ To use this patch, run these commands for a successful build:
  	}
  	if (server_filter_list.head && !am_sender) {
  		struct filter_list_struct *elp = &server_filter_list;
-@@ -1253,6 +1265,14 @@ int parse_arguments(int *argc, const cha
- 				return 0;
- 			}
+@@ -1247,6 +1259,14 @@ int parse_arguments(int *argc, const cha
+ 			if (check_filter(elp, backup_dir, 1) < 0)
+ 				goto options_rejected;
  		}
 +		/* Clean backup_dir_dels same as for backup_dir */
 +		if (backup_dir_dels) {
@@ -231,7 +220,7 @@ To use this patch, run these commands for a successful build:
  	}
  
  	if (!backup_suffix)
-@@ -1264,6 +1284,16 @@ int parse_arguments(int *argc, const cha
+@@ -1258,6 +1278,16 @@ int parse_arguments(int *argc, const cha
  			backup_suffix);
  		return 0;
  	}
@@ -248,7 +237,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;
-@@ -1287,6 +1317,31 @@ int parse_arguments(int *argc, const cha
+@@ -1281,6 +1311,31 @@ int parse_arguments(int *argc, const cha
  			"P *%s", backup_suffix);
  		parse_rule(&filter_list, backup_dir_buf, 0, 0);
  	}
@@ -280,7 +269,7 @@ To use this patch, run these commands for a successful build:
  	if (make_backups && !backup_dir)
  		omit_dir_times = 1;
  
-@@ -1646,6 +1701,10 @@ void server_options(char **args,int *arg
+@@ -1645,6 +1700,10 @@ void server_options(char **args,int *arg
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
  	}
@@ -291,7 +280,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) {
-@@ -1654,7 +1713,13 @@ void server_options(char **args,int *arg
+@@ -1653,7 +1712,13 @@ void server_options(char **args,int *arg
  			goto oom;
  		args[ac++] = arg;
  	}