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 2004-10-06 00:12:15
-+++ 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
+
+diff --git a/backup.c b/backup.c
+--- a/backup.c
++++ b/backup.c
+@@ -29,10 +29,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)
+@@ -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 (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)
+@@ -96,7 +120,7 @@ int make_bak_dir(const char *fullpath)
{
- STRUCT_STAT st;
-- char *rel = fullpath + backup_dir_len;
-+ int dir_len = deleting ? delete_dir_len : backup_dir_len;
-+ char *rel = fullpath + dir_len;
- char *end = rel + strlen(rel);
- char *p = end;
+ char fbuf[MAXPATHLEN], *rel, *end, *p;
+ struct file_struct *file;
+- int len = backup_dir_len;
++ int len = deleting ? backup_dir_dels_len : backup_dir_len;
+ stat_x sx;
-@@ -173,7 +199,8 @@ static int keep_backup(char *fname)
- if (!(file = make_file(fname, NULL, NO_EXCLUDES)))
+ while (*fullpath == '.' && fullpath[1] == '/') {
+@@ -221,7 +245,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 */
-@@ -264,3 +291,13 @@ int make_backup(char *fname)
+ }
+@@ -356,7 +381,17 @@ static int keep_backup(const char *fname)
+ /* main backup switch routine */
+ int make_backup(const char *fname)
+ {
+- if (backup_dir)
++ if (deleting ? backup_dir_dels : backup_dir)
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/options.c 2004-10-14 17:11:40
-+++ options.c 2004-09-22 02:25:03
-@@ -113,10 +113,14 @@ int no_detach = 0;
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -96,6 +96,9 @@ extern uid_t our_uid;
+ extern char *backup_dir;
+ extern char *backup_suffix;
+ extern int backup_suffix_len;
++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 daemon_filter_list;
+
+@@ -142,10 +145,15 @@ static void handle_skipped_hlink(struct file_struct *file, int itemizing,
+ enum logcode code, int f_out);
+ #endif
+
++
++/* 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 - backup_suffix_dels_len;
++ return k > 0 && strcmp(fn+k, backup_suffix_dels) == 0;
+ }
+
+ /* Delete a file or directory. If DEL_RECURSE is set in the flags, this will
+@@ -193,9 +201,9 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
+ 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;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -150,10 +150,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 *compare_dest = NULL;
-@@ -126,7 +130,9 @@ char *log_format = NULL;
+ char *basis_dir[MAX_BASIS_DIRS+1];
+@@ -165,7 +169,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];
- int rsync_port = RSYNC_PORT;
- int link_dest = 0;
-
-@@ -239,7 +245,9 @@ void usage(enum logcode F)
- rprintf(F," --no-implied-dirs don't send implied dirs with -R\n");
++char backup_dir_dels_buf[MAXPATHLEN];
+ char *sockopts = NULL;
+ int rsync_port = 0;
+ int compare_dest = 0;
+@@ -326,6 +332,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," --inplace update destination files inplace (SEE MAN PAGE)\n");
- rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
-@@ -319,6 +327,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 },
-@@ -384,6 +393,7 @@ static struct poptOption long_options[]
- {"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 },
- {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 },
+ 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=DIR backup removed files into hierarchy based in DIR\n");
++ rprintf(F," --suffix-dels=SUFFIX set removed-files suffix (def. --suffix w/o b-d-d)\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," --append append data onto shorter files\n");
+@@ -610,7 +618,9 @@ static struct poptOption long_options[] = {
+ {"backup", 'b', POPT_ARG_VAL, &make_backups, 1, 0, 0 },
+ {"no-backup", 0, POPT_ARG_VAL, &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 },
-@@ -796,6 +806,8 @@ int parse_arguments(int *argc, const cha
- compare_dest = sanitize_path(NULL, compare_dest, NULL, 0);
+@@ -1454,6 +1464,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, SP_DEFAULT);
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, SP_DEFAULT);
++ if (backup_dir_dels)
++ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, SP_DEFAULT);
}
-@@ -821,6 +833,12 @@ int parse_arguments(int *argc, const cha
- if (check_exclude(elp, backup_dir, 1) < 0)
+ if (daemon_filter_list.head && !am_sender) {
+ struct filter_list_struct *elp = &daemon_filter_list;
+@@ -1475,6 +1487,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ if (check_filter(elp, FLOG, 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, FLOG, backup_dir_dels, 1) < 0)
+ goto options_rejected;
+ }
}
- if (server_exclude_list.head && files_from) {
- clean_fname(files_from, 1);
-@@ -841,6 +859,16 @@ int parse_arguments(int *argc, const cha
+
+ if (!backup_suffix)
+@@ -1486,6 +1506,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
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) {
++ /* --suffix-dels defaults to --suffix, or empty for a client given an
++ * explicit --backup-dir-dels (just as --suffix defaults to empty when
++ * a --backup-dir is given). The second case does not apply to the
++ * server for consistency with server_options, which sends --suffix-dels
++ * to the server iff it differs from --suffix. */
++ if (!backup_suffix_dels)
++ backup_suffix_dels = backup_dir_dels && !am_server ? "" : 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;
-@@ -860,6 +888,31 @@ int parse_arguments(int *argc, const cha
- "--suffix cannot be a null string without --backup-dir\n");
- return 0;
+@@ -1509,6 +1543,34 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ "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) {
++ 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_dir) {
++ 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_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;
++ } else if (make_backups && delete_mode && !delete_excluded && !am_server) {
++ snprintf(backup_dir_dels_buf, sizeof backup_dir_dels_buf,
++ "P *%s", backup_suffix_dels);
++ parse_rule(&filter_list, backup_dir_dels_buf, 0, 0);
+ }
- if (do_progress && !verbose)
- verbose = 1;
-@@ -1066,6 +1119,10 @@ void server_options(char **args,int *arg
+ if (make_backups && !backup_dir) {
+ omit_dir_times = 0; /* Implied, so avoid -O to sender. */
+@@ -1917,6 +1979,10 @@ void server_options(char **args, int *argc_p)
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) {
-@@ -1074,7 +1131,13 @@ void server_options(char **args,int *arg
+@@ -1925,7 +1991,14 @@ void server_options(char **args, int *argc_p)
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 value different from the
++ * --suffix value, which would normally be used for deletions too. */
++ if (strcmp(backup_suffix_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";
---- orig/receiver.c 2004-09-21 09:40:27
-+++ receiver.c 2004-09-22 02:09:20
-@@ -42,8 +42,11 @@ extern char *compare_dest;
- extern int make_backups;
- extern int do_progress;
- extern char *backup_dir;
-+extern char *delete_dir;
- extern char *backup_suffix;
-+extern char *delete_suffix;
- extern int backup_suffix_len;
-+extern int delete_suffix_len;
- extern int cleanup_got_literal;
- extern int module_id;
- extern int ignore_errors;
-@@ -77,11 +80,14 @@ static void delete_one(char *fn, int is_
- }
- }
-
--
-+/* Function now checks if file matches backup or delete suffix patterns */
- 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 = strlen(fn) - delete_suffix_len;
-+ return k > 0 && strcmp(fn+k, delete_suffix) == 0;
- }
-
-
-@@ -122,10 +128,11 @@ void delete_files(struct file_list *flis
- continue;
- if (flist_find(flist,local_file_list->files[i]) < 0) {
- char *f = f_name(local_file_list->files[i]);
-- if (make_backups && (backup_dir || !is_backup_file(f))) {
-- make_backup(f);
-+ int backup_file = is_backup_file(f);
-+ if (make_backups && (delete_dir || !backup_file)) {
-+ safe_delete(f);
- if (verbose) {
-- rprintf(FINFO, "deleting %s\n",
-+ rprintf(FINFO, "safe-deleting %s\n",
- safe_fname(f));
- }
- } else {
+ if (max_delete > 0) {
+ if (asprintf(&arg, "--max-delete=%d", max_delete) < 0)
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff