--- old/backup.c
+++ new/backup.c
-@@ -22,10 +22,15 @@
+@@ -23,10 +23,15 @@
extern int verbose;
extern int backup_dir_len;
extern int am_root;
extern int preserve_devices;
-@@ -33,6 +38,8 @@ extern int preserve_specials;
+@@ -34,6 +39,8 @@ extern int preserve_specials;
extern int preserve_links;
extern int safe_symlinks;
/* make a complete pathname for backup file */
char *get_backup_name(char *fname)
{
-@@ -50,11 +57,28 @@ char *get_backup_name(char *fname)
+@@ -51,11 +58,28 @@ char *get_backup_name(char *fname)
return NULL;
}
if (!fnamebak)
return 0;
-@@ -94,7 +118,8 @@ path
+@@ -95,7 +119,8 @@ path
static int make_bak_dir(char *fullpath)
{
STRUCT_STAT st;
char *end = rel + strlen(rel);
char *p = end;
-@@ -182,7 +207,8 @@ static int keep_backup(char *fname)
+@@ -183,7 +208,8 @@ static int keep_backup(char *fname)
if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
return 1; /* the file could have disappeared */
return 0;
/* Check to see if this is a device file, or link */
-@@ -277,3 +303,13 @@ int make_backup(char *fname)
+@@ -278,3 +304,13 @@ int make_backup(char *fname)
return keep_backup(fname);
return make_simple_backup(fname);
}
extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
-@@ -102,10 +105,14 @@ static int can_link_devices = 1;
+@@ -100,10 +103,14 @@ static int deletion_count = 0; /* used t
#define DEL_TERSE (1<<3)
}
-@@ -126,8 +133,8 @@ static int delete_item(char *fname, int
+@@ -124,8 +131,8 @@ static int delete_item(char *fname, int
if (!S_ISDIR(mode)) {
if (max_delete && ++deletion_count > max_delete)
return 0;
else
ok = robust_unlink(fname) == 0;
if (ok) {
-@@ -149,9 +156,9 @@ static int delete_item(char *fname, int
+@@ -147,9 +154,9 @@ static int delete_item(char *fname, int
|| (dry_run && zap_dir)) {
ok = 0;
errno = ENOTEMPTY;
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");
-@@ -497,7 +505,9 @@ static struct poptOption long_options[]
+@@ -499,7 +507,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 },
-@@ -1212,6 +1222,8 @@ int parse_arguments(int *argc, const cha
- partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
+@@ -1215,6 +1225,8 @@ int parse_arguments(int *argc, const cha
+ partial_dir = sanitize_path(NULL, partial_dir, NULL, 0, NULL);
if (backup_dir)
- backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
+ backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL);
+ if (backup_dir_dels)
-+ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0);
++ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, NULL);
}
if (server_filter_list.head && !am_sender) {
struct filter_list_struct *elp = &server_filter_list;
-@@ -1246,6 +1258,14 @@ int parse_arguments(int *argc, const cha
+@@ -1241,6 +1253,14 @@ int parse_arguments(int *argc, const cha
return 0;
}
}
}
if (!backup_suffix)
-@@ -1257,6 +1277,16 @@ int parse_arguments(int *argc, const cha
+@@ -1252,6 +1272,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;
-@@ -1280,6 +1310,31 @@ int parse_arguments(int *argc, const cha
+@@ -1275,6 +1305,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;
-@@ -1624,6 +1679,10 @@ void server_options(char **args,int *arg
+@@ -1619,6 +1674,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) {
-@@ -1632,7 +1691,13 @@ void server_options(char **args,int *arg
+@@ -1627,7 +1686,13 @@ void server_options(char **args,int *arg
goto oom;
args[ac++] = arg;
}