-- Matt McCutchen <hashproduct@gmail.com>
-based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
{"no-backup", 0, POPT_ARG_VAL, &make_backups, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-@@ -2521,6 +2524,8 @@ void server_options(char **args, int *argc_p)
+@@ -2536,6 +2539,8 @@ void server_options(char **args, int *argc_p)
goto oom;
args[ac++] = arg;
}
extern int inplace;
extern int batch_fd;
extern int write_batch;
-@@ -125,6 +126,7 @@ void successful_send(int ndx)
+@@ -126,6 +127,7 @@ void successful_send(int ndx)
char fname[MAXPATHLEN];
struct file_struct *file;
struct file_list *flist;
if (!remove_source_files)
return;
-@@ -135,7 +137,11 @@ void successful_send(int ndx)
+@@ -136,7 +138,11 @@ void successful_send(int ndx)
return;
f_name(file, fname);