diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
-@@ -94,6 +94,9 @@ extern mode_t orig_umask;
+@@ -95,6 +95,9 @@ extern uid_t our_uid;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct filter_list_struct server_filter_list;
-@@ -128,10 +131,14 @@ enum delret {
+@@ -136,10 +139,15 @@ enum delret {
+ /* Forward declaration for delete_item(). */
static enum delret delete_dir_contents(char *fname, int flags);
-
++
+/* 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
-@@ -167,9 +174,9 @@ static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
+@@ -178,9 +186,9 @@ static enum delret delete_item(char *fbuf, int mode, int flags)
if (S_ISDIR(mode)) {
what = "rmdir";
ok = do_rmdir(fbuf) == 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 },
-@@ -1404,6 +1414,8 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
+@@ -1405,6 +1415,8 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
tmpdir = sanitize_path(NULL, tmpdir, NULL, 0);
if (backup_dir)
backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
}
if (server_filter_list.head && !am_sender) {
struct filter_list_struct *elp = &server_filter_list;
-@@ -1425,6 +1437,14 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
+@@ -1426,6 +1438,14 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
if (check_filter(elp, dir, 1) < 0)
goto options_rejected;
}
}
if (!backup_suffix)
-@@ -1436,6 +1456,16 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
+@@ -1437,6 +1457,15 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
backup_suffix);
return 0;
}
-+ /* 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 = 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,
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;
-@@ -1459,6 +1489,31 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
+@@ -1460,6 +1489,30 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
"P *%s", backup_suffix);
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");
if (make_backups && !backup_dir) {
omit_dir_times = 0; /* Implied, so avoid -O to sender. */
-@@ -1852,6 +1907,10 @@ void server_options(char **args, int *argc_p)
+@@ -1853,6 +1906,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) {
-@@ -1860,7 +1919,13 @@ void server_options(char **args, int *argc_p)
+@@ -1861,7 +1918,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