+static int deleting;
+
/* make a complete pathname for backup file */
- char *get_backup_name(char *fname)
+ char *get_backup_name(const char *fname)
{
-@@ -51,11 +58,28 @@ char *get_backup_name(char *fname)
+@@ -51,11 +58,28 @@ char *get_backup_name(const char *fname)
return NULL;
}
-+static char *get_delete_name(char *fname)
++static char *get_delete_name(const char *fname)
+{
+ if (backup_dir_dels) {
+ if (stringjoin(backup_dir_dels_buf + backup_dir_dels_len, backup_dir_dels_remainder,
+}
+
/* simple backup creates a backup with a suffix in the same directory */
- static int make_simple_backup(char *fname)
+ static int make_simple_backup(const char *fname)
{
int rename_errno;
-- char *fnamebak = get_backup_name(fname);
-+ char *fnamebak = deleting ? get_delete_name(fname)
-+ : get_backup_name(fname);
+- const char *fnamebak = get_backup_name(fname);
++ const char *fnamebak = deleting ? get_delete_name(fname)
++ : get_backup_name(fname);
if (!fnamebak)
return 0;
char *end = rel + strlen(rel);
char *p = end;
-@@ -185,7 +210,8 @@ static int keep_backup(char *fname)
+@@ -185,7 +210,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 */
return 0;
/* Check to see if this is a device file, or link */
-@@ -280,3 +306,13 @@ int make_backup(char *fname)
+@@ -280,3 +306,13 @@ int make_backup(const char *fname)
return keep_backup(fname);
return make_simple_backup(fname);
}
char *sockopts = NULL;
int rsync_port = 0;
int compare_dest = 0;
-@@ -292,6 +298,8 @@ void usage(enum logcode F)
+@@ -288,6 +294,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");
-@@ -520,7 +528,9 @@ static struct poptOption long_options[]
+@@ -516,7 +524,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 },
-@@ -1234,6 +1244,8 @@ int parse_arguments(int *argc, const cha
+@@ -1230,6 +1240,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;
-@@ -1251,6 +1263,14 @@ int parse_arguments(int *argc, const cha
+@@ -1247,6 +1259,14 @@ int parse_arguments(int *argc, const cha
if (check_filter(elp, backup_dir, 1) < 0)
goto options_rejected;
}
}
if (!backup_suffix)
-@@ -1262,6 +1282,16 @@ int parse_arguments(int *argc, const cha
+@@ -1258,6 +1278,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;
-@@ -1285,6 +1315,31 @@ int parse_arguments(int *argc, const cha
+@@ -1281,6 +1311,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;
-@@ -1649,6 +1704,10 @@ void server_options(char **args,int *arg
+@@ -1645,6 +1700,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) {
-@@ -1657,7 +1716,13 @@ void server_options(char **args,int *arg
+@@ -1653,7 +1712,13 @@ void server_options(char **args,int *arg
goto oom;
args[ac++] = arg;
}