--- old/backup.c
+++ new/backup.c
-@@ -23,10 +23,15 @@
-
- extern int verbose;
+@@ -30,10 +30,17 @@ extern int safe_symlinks;
+ extern int flist_extra_ndx;
+ extern int file_struct_len;
extern int backup_dir_len;
+extern int backup_dir_dels_len;
extern unsigned int backup_dir_remainder;
+extern char *backup_suffix_dels;
extern char *backup_dir;
+extern char *backup_dir_dels;
-
- extern int am_root;
- extern int preserve_devices;
-@@ -34,6 +39,8 @@ extern int preserve_specials;
- extern int preserve_links;
- extern int safe_symlinks;
-
-+static int deleting;
+
++static int deleting;
+
/* make a complete pathname for backup file */
char *get_backup_name(const char *fname)
- {
-@@ -51,11 +58,28 @@ char *get_backup_name(const char *fname)
+@@ -52,11 +59,28 @@ char *get_backup_name(const char *fname)
return NULL;
}
if (!fnamebak)
return 0;
-@@ -95,7 +119,8 @@ path
+@@ -96,7 +120,8 @@ path
static int make_bak_dir(char *fullpath)
{
STRUCT_STAT st;
char *end = rel + strlen(rel);
char *p = end;
-@@ -185,7 +210,8 @@ static int keep_backup(const char *fname
+@@ -186,7 +211,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 */
-@@ -280,3 +306,13 @@ int make_backup(const char *fname)
+ }
+@@ -285,3 +311,13 @@ int make_backup(const char *fname)
return keep_backup(fname);
return make_simple_backup(fname);
}
+}
--- old/generator.c
+++ new/generator.c
-@@ -90,6 +90,9 @@ extern dev_t filesystem_dev;
+@@ -92,6 +92,9 @@ extern dev_t filesystem_dev;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
-@@ -115,10 +118,14 @@ enum delret {
+@@ -117,10 +120,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
-@@ -154,9 +161,9 @@ static enum delret delete_item(char *fbu
+@@ -156,9 +163,9 @@ static enum delret delete_item(char *fbu
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 },
-@@ -1230,6 +1240,8 @@ int parse_arguments(int *argc, const cha
+@@ -1235,6 +1245,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;
-@@ -1247,6 +1259,14 @@ int parse_arguments(int *argc, const cha
+@@ -1252,6 +1264,14 @@ int parse_arguments(int *argc, const cha
if (check_filter(elp, backup_dir, 1) < 0)
goto options_rejected;
}
}
if (!backup_suffix)
-@@ -1258,6 +1278,16 @@ int parse_arguments(int *argc, const cha
+@@ -1263,6 +1283,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;
-@@ -1281,6 +1311,31 @@ int parse_arguments(int *argc, const cha
+@@ -1286,6 +1316,31 @@ int parse_arguments(int *argc, const cha
"P *%s", backup_suffix);
parse_rule(&filter_list, backup_dir_buf, 0, 0);
}
if (make_backups && !backup_dir)
omit_dir_times = 1;
-@@ -1645,6 +1700,10 @@ void server_options(char **args,int *arg
+@@ -1650,6 +1705,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) {
-@@ -1653,7 +1712,13 @@ void server_options(char **args,int *arg
+@@ -1658,7 +1717,13 @@ void server_options(char **args,int *arg
goto oom;
args[ac++] = arg;
}