extern int io_error;
extern char *tmpdir;
extern char *compare_dest;
+extern int make_backups;
+extern char *backup_suffix;
static struct delete_list {
static void delete_one(struct file_struct *f)
{
if (!S_ISDIR(f->mode)) {
- if (do_unlink(f_name(f)) != 0) {
+ if (robust_unlink(f_name(f)) != 0) {
rprintf(FERROR,"unlink %s : %s\n",f_name(f),strerror(errno));
} else if (verbose) {
rprintf(FINFO,"deleting %s\n",f_name(f));
S_ISDIR(local_file_list->files[i]->mode))
add_delete_entry(local_file_list->files[i]);
if (-1 == flist_find(flist,local_file_list->files[i])) {
- delete_one(local_file_list->files[i]);
- }
+ char *f = f_name(local_file_list->files[i]);
+ int k = strlen(f) - strlen(backup_suffix);
+ if (make_backups && ((k <= 0) ||
+ (strcmp(f+k,backup_suffix) != 0))) {
+ (void) make_backup(f);
+ } else {
+ delete_one(local_file_list->files[i]);
+ }
+ }
}
flist_free(local_file_list);
free(name);
setuid/setgid bits to ensure that there is no race
condition. They are then correctly updated after
the lchown. Thanks to snabb@epipe.fi for pointing
- this out */
+ this out. We also set it initially without group
+ access because of a similar race condition. */
fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
- file->mode & ACCESSPERMS);
+ file->mode & INITACCESSPERMS);
if (fd2 == -1 && relative_paths && errno == ENOENT &&
create_directory_path(fnametmp) == 0) {
fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
- file->mode & ACCESSPERMS);
+ file->mode & INITACCESSPERMS);
}
if (fd2 == -1) {
- rprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
+ rprintf(FERROR,"cannot create %s : %s\n",fnametmp,strerror(errno));
receive_data(f_in,buf,-1,NULL,file->length);
if (buf) unmap_file(buf);
if (fd1 != -1) close(fd1);