read_sum_head(f_in, &sum);
if (fd_r >= 0 && size_r > 0) {
- mapbuf = map_file(fd_r, size_r, sum.blength);
+ OFF_T map_size = MAX(sum.blength * 2, 16*1024);
+ mapbuf = map_file(fd_r, size_r, map_size, sum.blength);
if (verbose > 2) {
rprintf(FINFO, "recv mapped %s of size %.0f\n",
safe_fname(fname_r), (double)size_r);
} else
fnamecmp = partialptr = fname;
+ if (inplace && make_backups) {
+ if (!(fnamecmp = get_backup_name(fname)))
+ fnamecmp = partialptr;
+ }
+
/* open the file */
fd1 = do_open(fnamecmp, O_RDONLY, 0);
/* We now check to see if we are writing file "inplace" */
if (inplace) {
- fd2 = do_open(fnamecmp, O_WRONLY|O_CREAT, 0);
+ fd2 = do_open(fname, O_WRONLY|O_CREAT, 0);
if (fd2 == -1) {
rsyserr(FERROR, errno, "open %s failed",
- full_fname(fnamecmp));
+ full_fname(fname));
discard_receive_data(f_in, file->length);
if (fd1 != -1)
close(fd1);