if (!fnamebak)
return 0;
-@@ -94,7 +118,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 ? backup_dir_dels_len : backup_dir_len;
+ char *rel = fullpath + dir_len;
char *end = rel + strlen(rel);
char *p = end;
-@@ -184,7 +209,8 @@ static int keep_backup(const char *fname
+@@ -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 */
unmake_file(file);
return 0;
}
-@@ -284,3 +310,13 @@ int make_backup(const char *fname)
+@@ -306,3 +332,13 @@ int make_backup(const char *fname)
return keep_backup(fname);
return make_simple_backup(fname);
}
+}
--- old/generator.c
+++ new/generator.c
-@@ -93,6 +93,9 @@ extern dev_t filesystem_dev;
+@@ -94,6 +94,9 @@ extern mode_t orig_umask;
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;
-@@ -123,10 +126,14 @@ enum delret {
+@@ -127,10 +130,14 @@ enum delret {
static enum delret delete_dir_contents(char *fname, int flags);
}
/* Delete a file or directory. If DEL_RECURSE is set in the flags, this will
-@@ -162,9 +169,9 @@ static enum delret delete_item(char *fbu
+@@ -166,9 +173,9 @@ static enum delret delete_item(char *fbu
if (S_ISDIR(mode)) {
what = "rmdir";
ok = do_rmdir(fbuf) == 0;
char *sockopts = NULL;
int rsync_port = 0;
int compare_dest = 0;
-@@ -288,6 +294,8 @@ void usage(enum logcode F)
+@@ -293,6 +299,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," -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");
-@@ -516,7 +524,9 @@ static struct poptOption long_options[]
+@@ -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 },
{"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 },
-@@ -1242,6 +1252,8 @@ int parse_arguments(int *argc, const cha
+@@ -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, NULL);
}
if (server_filter_list.head && !am_sender) {
struct filter_list_struct *elp = &server_filter_list;
-@@ -1259,6 +1271,14 @@ int parse_arguments(int *argc, const cha
+@@ -1288,6 +1300,14 @@ int parse_arguments(int *argc, const cha
if (check_filter(elp, backup_dir, 1) < 0)
goto options_rejected;
}
}
if (!backup_suffix)
-@@ -1270,6 +1290,16 @@ int parse_arguments(int *argc, const cha
+@@ -1299,6 +1319,16 @@ int parse_arguments(int *argc, const cha
backup_suffix);
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;
-@@ -1293,6 +1323,31 @@ int parse_arguments(int *argc, const cha
+@@ -1322,6 +1352,31 @@ int parse_arguments(int *argc, const cha
"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) {
if (make_backups && !backup_dir)
omit_dir_times = 1;
-@@ -1660,6 +1715,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;
}
/* Only send --suffix if it specifies a non-default value. */
if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1668,7 +1727,13 @@ void server_options(char **args,int *arg
+@@ -1697,7 +1756,13 @@ void server_options(char **args,int *arg
goto oom;
args[ac++] = arg;
}