rprintf(FINFO, "deleting %s\n", safe_fname(fn));
} else {
if (do_rmdir(fn) != 0) {
- if (errno == ENOTDIR && keep_dirlinks) {
- delete_one(fn, 0);
- return;
- }
if (errno != ENOTEMPTY && errno != EEXIST) {
rsyserr(FERROR, errno,
"delete_one: rmdir %s failed",
} 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);