./configure (optional if already run)
make
---- old/backup.c
-+++ new/backup.c
+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;
struct file_struct *file;
- int len = backup_dir_len;
+ int len = deleting ? backup_dir_dels_len : backup_dir_len;
- statx sx;
+ stat_x sx;
while (*fullpath == '.' && fullpath[1] == '/') {
-@@ -211,7 +235,8 @@ static int keep_backup(const char *fname
+@@ -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 */
unmake_file(file);
return 0;
}
-@@ -326,3 +351,13 @@ int make_backup(const 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);
}
+ deleting = 0;
+ return ret;
+}
---- old/generator.c
-+++ new/generator.c
-@@ -93,6 +93,9 @@ extern mode_t orig_umask;
+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_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;
- #ifdef ICONV_OPTION
-@@ -130,10 +133,14 @@ enum delret {
- static enum delret delete_dir_contents(char *fname, int flags);
+ 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)
{
}
/* Delete a file or directory. If DEL_RECURSE is set in the flags, this will
-@@ -169,9 +176,9 @@ static enum delret delete_item(char *fbu
+@@ -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 {
what = "unlink";
ok = robust_unlink(fbuf) == 0;
---- old/options.c
-+++ new/options.c
-@@ -147,10 +147,14 @@ int no_detach
+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 backup_dir_dels_len = 0;
++int backup_dir_dels_len = 0;
int backup_suffix_len;
+int backup_suffix_dels_len;
unsigned int backup_dir_remainder;
char *tmpdir = NULL;
char *partial_dir = NULL;
char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -162,7 +166,9 @@ char *stdout_format = NULL;
+@@ -165,7 +169,9 @@ char *stdout_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
char *sockopts = NULL;
int rsync_port = 0;
int compare_dest = 0;
-@@ -318,6 +324,8 @@ void usage(enum logcode F)
+@@ -326,6 +332,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);
-+ 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," --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");
-@@ -588,7 +596,9 @@ static struct poptOption long_options[]
+@@ -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 },
{"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 },
-@@ -1400,6 +1410,8 @@ int parse_arguments(int *argc_p, const c
- tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
+@@ -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, NULL);
+ 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, NULL);
++ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, SP_DEFAULT);
}
- if (server_filter_list.head && !am_sender) {
- struct filter_list_struct *elp = &server_filter_list;
-@@ -1417,6 +1429,14 @@ int parse_arguments(int *argc_p, const c
- if (check_filter(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 backup_dir_dels same as for backup_dir */
+ if (!*backup_dir_dels)
+ goto options_rejected;
+ clean_fname(backup_dir_dels, 1);
-+ if (check_filter(elp, backup_dir_dels, 1) < 0)
++ if (check_filter(elp, FLOG, backup_dir_dels, 1) < 0)
+ goto options_rejected;
+ }
}
if (!backup_suffix)
-@@ -1428,6 +1448,16 @@ int parse_arguments(int *argc_p, const c
+@@ -1486,6 +1506,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
backup_suffix);
return 0;
}
-+ /* if backup_suffix_dels not supplied, default to backup_suffix */
++ /* --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 ? "" : backup_suffix;
++ 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,
+ "--suffix-dels cannot contain slashes: %s\n",
-+ backup_suffix_dels);
++ 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;
-@@ -1451,6 +1481,31 @@ int parse_arguments(int *argc_p, const c
+@@ -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);
+ 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) {
-+ 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) {
++ 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) {
+ }
+ if (verbose > 1 && !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,
+ "--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 (make_backups && !backup_dir) {
omit_dir_times = 0; /* Implied, so avoid -O to sender. */
-@@ -1845,6 +1900,10 @@ void server_options(char **args, int *ar
+@@ -1917,6 +1979,10 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
}
/* Only send --suffix if it specifies a non-default value. */
if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1853,7 +1912,13 @@ void server_options(char **args, int *ar
+@@ -1925,7 +1991,14 @@ void server_options(char **args, int *argc_p)
goto oom;
args[ac++] = arg;
}
-
-+ /* Only send --suffix-dels if it specifies a non-default value. */
-+ if (strcmp(backup_suffix_dels, backup_dir_dels ? "" : 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, "--suffix-dels=%s", backup_suffix_dels) < 0)
+ goto oom;
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff