This patches creates two new command line options as follows:
- --delete-dir
- --delete-suffix
+ --backup-dir-dels=DIR
+ --suffix-dels=SUFFIX
-The delete-dir and delete-suffix options give the ability to store
-backup of deleted files on the receiver in different directories
-or with different suffix than the backup of files that have been
-changed but that are still on the source drive. Both commands can
-be combined.
+The backup-dir-dels and suffix-dels options give the ability to store
+backup of removed files on the receiver in different directories or with
+different suffix than the backup of files that have been changed but that
+are still on the source drive. Both commands can be combined.
The default behaviour if one or both of the options are not specified
is the previous behaviour, both backups use the same directory or
Marc St-Onge
---- orig/backup.c 2005-01-25 12:14:14
-+++ backup.c 2004-09-22 02:36:06
-@@ -22,11 +22,17 @@
-
- extern int verbose;
- extern int backup_suffix_len;
-+extern int delete_suffix_len;
+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
+@@ -28,10 +28,17 @@ extern int preserve_specials;
+ extern int preserve_links;
+ extern int safe_symlinks;
extern int backup_dir_len;
-+extern int delete_dir_len;
++extern int backup_dir_dels_len;
extern unsigned int backup_dir_remainder;
-+extern unsigned int delete_dir_remainder;
++extern unsigned int backup_dir_dels_remainder;
extern char backup_dir_buf[MAXPATHLEN];
-+extern char delete_dir_buf[MAXPATHLEN];
++extern char backup_dir_dels_buf[MAXPATHLEN];
extern char *backup_suffix;
-+extern char *delete_suffix;
++extern char *backup_suffix_dels;
extern char *backup_dir;
-+extern char *delete_dir;
-
- extern int am_root;
- extern int preserve_devices;
-@@ -35,6 +41,8 @@ extern int preserve_hard_links;
- extern int orig_umask;
- extern int safe_symlinks;
-
-+static int deleting;
++extern char *backup_dir_dels;
+
++static int deleting;
+
/* make a complete pathname for backup file */
- char *get_backup_name(char *fname)
- {
-@@ -52,10 +60,27 @@ char *get_backup_name(char *fname)
+ char *get_backup_name(const char *fname)
+@@ -50,11 +57,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 (delete_dir) {
-+ if (stringjoin(delete_dir_buf + delete_dir_len, delete_dir_remainder,
-+ fname, delete_suffix, NULL) < delete_dir_remainder)
-+ return delete_dir_buf;
++ if (backup_dir_dels) {
++ if (stringjoin(backup_dir_dels_buf + backup_dir_dels_len, backup_dir_dels_remainder,
++ fname, backup_suffix_dels, NULL) < backup_dir_dels_remainder)
++ return backup_dir_dels_buf;
+ } else {
-+ if (stringjoin(delete_dir_buf, MAXPATHLEN,
-+ fname, delete_suffix, NULL) < MAXPATHLEN)
-+ return delete_dir_buf;
++ if (stringjoin(backup_dir_dels_buf, MAXPATHLEN,
++ fname, backup_suffix_dels, NULL) < MAXPATHLEN)
++ return backup_dir_dels_buf;
+ }
+
+ rprintf(FERROR, "delete filename too long\n");
+}
+
/* 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)
{
-- char *fnamebak = get_backup_name(fname);
-+ char *fnamebak = deleting ? get_delete_name(fname)
-+ : get_backup_name(fname);
+ int rename_errno;
+- const char *fnamebak = get_backup_name(fname);
++ const char *fnamebak = deleting ? get_delete_name(fname)
++ : get_backup_name(fname);
if (!fnamebak)
return 0;
-@@ -81,7 +106,8 @@ path
- static int make_bak_dir(char *fullpath)
+@@ -95,7 +119,8 @@ static int make_bak_dir(char *fullpath)
{
- STRUCT_STAT st;
+ statx sx;
+ struct file_struct *file;
- char *rel = fullpath + backup_dir_len;
-+ int dir_len = deleting ? delete_dir_len : backup_dir_len;
++ int dir_len = deleting ? backup_dir_dels_len : backup_dir_len;
+ char *rel = fullpath + dir_len;
char *end = rel + strlen(rel);
char *p = end;
-@@ -168,7 +194,8 @@ static int keep_backup(char *fname)
- if (!(file = make_file(fname, NULL, NO_FILTERS)))
+@@ -198,7 +223,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 */
-- if (!(buf = get_backup_name(fname)))
+- if (!(buf = get_backup_name(fname))) {
+ buf = deleting ? get_delete_name(fname) : get_backup_name(fname);
-+ if (!buf)
++ if (!buf) {
+ unmake_file(file);
return 0;
-
- /* Check to see if this is a device file, or link */
-@@ -259,3 +286,13 @@ int make_backup(char *fname)
+ }
+@@ -306,3 +332,13 @@ int make_backup(const char *fname)
return keep_backup(fname);
return make_simple_backup(fname);
}
+
-+/* backup switch routine called only when backing-up deleted file */
++/* backup switch routine called only when backing-up removed file */
+int safe_delete(char *fname)
+{
+ int ret;
+ deleting = 0;
+ return ret;
+}
---- orig/flist.c 2005-01-25 12:14:14
-+++ flist.c 2005-01-24 02:21:33
-@@ -47,6 +47,8 @@ extern char curr_dir[MAXPATHLEN];
- extern unsigned int curr_dir_len;
+--- old/generator.c
++++ new/generator.c
+@@ -94,6 +94,9 @@ extern mode_t orig_umask;
extern char *backup_dir;
extern char *backup_suffix;
-+extern char *delete_dir;
-+extern char *delete_suffix;
- extern int filesfrom_fd;
-
- extern int one_file_system;
-@@ -61,6 +63,7 @@ extern int relative_paths;
- extern int implied_dirs;
- extern int make_backups;
extern int backup_suffix_len;
-+extern int delete_suffix_len;
- extern int copy_links;
- extern int copy_unsafe_links;
- extern int protocol_version;
-@@ -1659,10 +1662,14 @@ char *f_name(struct file_struct *f)
- return f_name_to(f, names[n]);
- }
++extern char *backup_dir_dels;
++extern char *backup_suffix_dels;
++extern int backup_suffix_dels_len;
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
+ extern struct filter_list_struct server_filter_list;
+
+@@ -127,10 +130,14 @@ enum delret {
+ static enum delret delete_dir_contents(char *fname, int flags);
+
-+/* Function now checks if file matches backup or delete suffix patterns */
++/* Function now compares both backup_suffix and backup_suffix_dels. */
static int is_backup_file(char *fn)
{
int k = strlen(fn) - backup_suffix_len;
- return k > 0 && strcmp(fn+k, backup_suffix) == 0;
+ if (k > 0 && strcmp(fn+k, backup_suffix) == 0)
+ return 1;
-+ k += backup_suffix_len - delete_suffix_len;
-+ return k > 0 && strcmp(fn+k, delete_suffix) == 0;
++ k += backup_suffix_len - backup_suffix_dels_len;
++ return k > 0 && strcmp(fn+k, backup_suffix_dels) == 0;
}
- void delete_in_dir(struct file_list *flist, char *fname)
-@@ -1716,11 +1723,12 @@ void delete_in_dir(struct file_list *fli
- || (delete_during && S_ISDIR(mode)
- && !S_ISDIR(flist->files[j]->mode))) {
- char *f = f_name(del_flist->files[i]);
-- if (make_backups && (backup_dir || !is_backup_file(f))
-+ int backup_file = is_backup_file(f);
-+ if (make_backups && (delete_dir || !backup_file)
- && !S_ISDIR(mode)) {
-- make_backup(f);
-+ safe_delete(f);
- if (verbose) {
-- rprintf(FINFO, "deleting %s\n",
-+ rprintf(FINFO, "safe-deleting %s\n",
- safe_fname(f));
- }
- } else {
---- orig/options.c 2005-01-25 12:14:14
-+++ options.c 2004-11-27 18:37:18
-@@ -119,10 +119,14 @@ int no_detach = 0;
+ /* Delete a file or directory. If DEL_RECURSE is set in the flags, this will
+@@ -166,9 +173,9 @@ static enum delret delete_item(char *fbu
+ if (S_ISDIR(mode)) {
+ what = "rmdir";
+ ok = do_rmdir(fbuf) == 0;
+- } else if (make_backups > 0 && (backup_dir || !is_backup_file(fbuf))) {
++ } else if (make_backups > 0 && (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
+@@ -137,10 +137,14 @@ int no_detach
int write_batch = 0;
int read_batch = 0;
int backup_dir_len = 0;
-+int delete_dir_len = 0;
++int backup_dir_dels_len = 0;
int backup_suffix_len;
-+int delete_suffix_len;
++int backup_suffix_dels_len;
unsigned int backup_dir_remainder;
-+unsigned int delete_dir_remainder;
++unsigned int backup_dir_dels_remainder;
char *backup_suffix = NULL;
-+char *delete_suffix = NULL;
++char *backup_suffix_dels = NULL;
char *tmpdir = NULL;
char *partial_dir = NULL;
char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -132,7 +136,9 @@ char *log_format = NULL;
+@@ -152,7 +156,9 @@ char *stdout_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
-+char *delete_dir = NULL;
++char *backup_dir_dels = NULL;
char backup_dir_buf[MAXPATHLEN];
-+char delete_dir_buf[MAXPATHLEN];
++char backup_dir_dels_buf[MAXPATHLEN];
+ char *sockopts = NULL;
int rsync_port = 0;
int compare_dest = 0;
- int copy_dest = 0;
-@@ -251,7 +257,9 @@ void usage(enum logcode F)
- rprintf(F," --no-implied-dirs don't send implied dirs with -R\n");
+@@ -293,6 +299,8 @@ void usage(enum logcode F)
rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n");
- rprintf(F," --backup-dir make backups into this directory\n");
-+ rprintf(F," --delete-dir make backups of deleted files into this directory\n");
- rprintf(F," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
-+ rprintf(F," --delete-suffix=SUFFIX deleted files suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
- rprintf(F," -u, --update update only (don't overwrite newer files)\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);
++ rprintf(F," --backup-dir-dels make backups of removed files into current dir\n");
++ 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");
-@@ -342,6 +350,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 },
-+ {"delete-suffix", 0, POPT_ARG_STRING, &delete_suffix, 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 },
-@@ -416,6 +425,7 @@ static struct poptOption long_options[]
- {"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 },
+ rprintf(F," --append append data onto shorter files\n");
+@@ -527,7 +535,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 },
-+ {"delete-dir", 0, POPT_ARG_STRING, &delete_dir, 0, 0, 0 },
- {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 },
++ {"backup-dir-dels", 0, POPT_ARG_STRING, &backup_dir_dels, 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 },
-@@ -918,6 +928,8 @@ int parse_arguments(int *argc, const cha
- partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
+@@ -1271,6 +1281,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 (delete_dir)
-+ delete_dir = sanitize_path(NULL, delete_dir, NULL, 0);
- if (files_from)
- files_from = sanitize_path(NULL, files_from, 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);
}
-@@ -944,6 +956,12 @@ int parse_arguments(int *argc, const cha
+ if (server_filter_list.head && !am_sender) {
+ struct filter_list_struct *elp = &server_filter_list;
+@@ -1288,6 +1300,14 @@ int parse_arguments(int *argc, const cha
if (check_filter(elp, backup_dir, 1) < 0)
goto options_rejected;
}
-+ /* Clean delete_dir same as for backup_dir */
-+ if (delete_dir) {
-+ clean_fname(delete_dir, 1);
-+ if (check_exclude(elp, delete_dir, 1) < 0)
++ /* Clean backup_dir_dels same as for backup_dir */
++ if (backup_dir_dels) {
++ if (!*backup_dir_dels)
++ goto options_rejected;
++ clean_fname(backup_dir_dels, 1);
++ if (check_filter(elp, backup_dir_dels, 1) < 0)
+ goto options_rejected;
+ }
}
- if (server_filter_list.head && files_from) {
- clean_fname(files_from, 1);
-@@ -964,6 +982,16 @@ int parse_arguments(int *argc, const cha
+
+ if (!backup_suffix)
+@@ -1299,6 +1319,16 @@ int parse_arguments(int *argc, const cha
backup_suffix);
return 0;
}
-+ /* if deleted_suffix not supplied, default to backup_suffix */
-+ if (!delete_suffix)
-+ delete_suffix = delete_dir ? "" : backup_suffix;
-+ delete_suffix_len = strlen(delete_suffix);
-+ if (strchr(delete_suffix, '/') != NULL) {
++ /* if backup_suffix_dels not supplied, default to backup_suffix */
++ if (!backup_suffix_dels)
++ backup_suffix_dels = backup_dir_dels ? "" : backup_suffix;
++ backup_suffix_dels_len = strlen(backup_suffix_dels);
++ if (strchr(backup_suffix_dels, '/') != NULL) {
+ snprintf(err_buf, sizeof err_buf,
-+ "--delete-suffix cannot contain slashes: %s\n",
-+ delete_suffix);
++ "--suffix-dels cannot contain slashes: %s\n",
++ backup_suffix_dels);
+ return 0;
+ }
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;
-@@ -983,6 +1011,31 @@ int parse_arguments(int *argc, const cha
- "--suffix cannot be a null string without --backup-dir\n");
- return 0;
+@@ -1322,6 +1352,31 @@ int parse_arguments(int *argc, const cha
+ "P *%s", backup_suffix);
+ parse_rule(&filter_list, backup_dir_buf, 0, 0);
}
-+ /* If delete_dir not supplied default to backup_dir if it has been supplied */
-+ if (backup_dir && !delete_dir) {
-+ delete_dir = backup_dir;
-+ delete_dir_len = backup_dir_len;
-+ delete_dir_remainder = backup_dir_remainder;
-+ strlcpy(delete_dir_buf, backup_dir_buf, sizeof backup_dir_buf);
-+ } else if (delete_dir) {
-+ delete_dir_len = strlcpy(delete_dir_buf, delete_dir, sizeof delete_dir_buf);
-+ delete_dir_remainder = sizeof delete_dir_buf - delete_dir_len;
-+ if (delete_dir_remainder < 32) {
++ /* If backup_dir_dels not supplied default to backup_dir if it has been supplied */
++ if (backup_dir && !backup_dir_dels) {
++ backup_dir_dels = backup_dir;
++ backup_dir_dels_len = backup_dir_len;
++ backup_dir_dels_remainder = backup_dir_remainder;
++ strlcpy(backup_dir_dels_buf, backup_dir_buf, sizeof backup_dir_buf);
++ } else if (backup_dir_dels) {
++ backup_dir_dels_len = strlcpy(backup_dir_dels_buf, backup_dir_dels, sizeof backup_dir_dels_buf);
++ backup_dir_dels_remainder = sizeof backup_dir_dels_buf - backup_dir_dels_len;
++ if (backup_dir_dels_remainder < 32) {
+ snprintf(err_buf, sizeof err_buf,
-+ "the --delete-dir path is WAY too long.\n");
++ "the --backup-dir-dels path is WAY too long.\n");
+ return 0;
+ }
-+ if (delete_dir_buf[delete_dir_len - 1] != '/') {
-+ delete_dir_buf[delete_dir_len++] = '/';
-+ delete_dir_buf[delete_dir_len] = '\0';
++ if (backup_dir_dels_buf[backup_dir_dels_len - 1] != '/') {
++ backup_dir_dels_buf[backup_dir_dels_len++] = '/';
++ backup_dir_dels_buf[backup_dir_dels_len] = '\0';
+ }
+ if (verbose > 1 && !am_sender)
-+ rprintf(FINFO, "delete_dir is %s\n", delete_dir_buf);
-+ } else if (!delete_suffix_len && (!am_server || !am_sender)) {
++ rprintf(FINFO, "backup_dir_dels is %s\n", backup_dir_dels_buf);
++ } else if (!backup_suffix_dels_len && (!am_server || !am_sender)) {
+ snprintf(err_buf, sizeof err_buf,
-+ "--delete-suffix cannot be a null string without --delete-dir\n");
++ "--suffix-dels cannot be a null string without --backup-dir-dels\n");
+ return 0;
+ }
+ if (make_backups && !backup_dir)
+ omit_dir_times = 1;
- if (do_progress && !verbose)
- verbose = 1;
-@@ -1196,6 +1249,10 @@ void server_options(char **args,int *arg
+@@ -1689,6 +1744,10 @@ void server_options(char **args,int *arg
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
}
-+ if (delete_dir) {
-+ args[ac++] = "--delete-dir";
-+ args[ac++] = delete_dir;
++ 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) {
-@@ -1204,7 +1261,13 @@ void server_options(char **args,int *arg
+@@ -1697,7 +1756,13 @@ void server_options(char **args,int *arg
goto oom;
args[ac++] = arg;
}
-
-+ /* Only send --delete-suffix if it specifies a non-default value. */
-+ if (strcmp(delete_suffix, delete_dir ? "" : BACKUP_SUFFIX) != 0) {
++ /* Only send --suffix-dels if it specifies a non-default value. */
++ if (strcmp(backup_suffix_dels, backup_dir_dels ? "" : BACKUP_SUFFIX) != 0) {
+ /* We use the following syntax to avoid weirdness with '~'. */
-+ if (asprintf(&arg, "--delete-suffix=%s", delete_suffix) < 0)
++ if (asprintf(&arg, "--suffix-dels=%s", backup_suffix_dels) < 0)
+ goto oom;
+ args[ac++] = arg;
+ }
if (am_sender) {
- if (delete_excluded)
- args[ac++] = "--delete-excluded";
+ if (delete_before)
+ args[ac++] = "--delete-before";
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff