int ret;
extern int recurse;
- if (do_unlink(fname) == 0 || errno == ENOENT) return 0;
+ if (robust_unlink(fname) == 0 || errno == ENOENT) return 0;
#if SUPPORT_LINKS
ret = do_lstat(fname, &st);
}
#ifdef HAVE_CHMOD
- if (preserve_perms && !S_ISLNK(st->st_mode) &&
- (st->st_mode != file->mode ||
- (updated && (file->mode & ~INITPERMMASK)))) {
- updated = 1;
- if (do_chmod(fname,file->mode) != 0) {
- rprintf(FERROR,"failed to set permissions on %s : %s\n",
- fname,strerror(errno));
- return 0;
+ if (!S_ISLNK(st->st_mode)) {
+ int file_mode;
+ if (preserve_perms)
+ file_mode = file->mode;
+ else
+ file_mode = file->mode & ACCESSPERMS;
+ if (st->st_mode != file->mode) {
+ updated = 1;
+ if (do_chmod(fname,file_mode) != 0) {
+ rprintf(FERROR,"failed to set permissions on %s : %s\n",
+ fname,strerror(errno));
+ return 0;
+ }
}
}
#endif
slprintf(fnamebak,sizeof(fnamebak),"%s%s",fname,backup_suffix);
if (do_rename(fname,fnamebak) != 0) {
- if (errno != ENOENT) {
+ /* cygwin (at least version b19) reports EINVAL */
+ if (errno != ENOENT && errno != EINVAL) {
rprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
return 0;
}
return;
/* move tmp file over real file */
- if (do_rename(fnametmp,fname) != 0) {
+ if (robust_rename(fnametmp,fname) != 0) {
if (errno == EXDEV) {
/* rename failed on cross-filesystem link.
Copy the file instead. */
- if (copy_file(fnametmp,fname, file->mode & INITPERMMASK)) {
+ if (copy_file(fnametmp,fname, file->mode & INITACCESSPERMS)) {
rprintf(FERROR,"copy %s -> %s : %s\n",
fnametmp,fname,strerror(errno));
} else {
set_perms(fname,file,NULL,0);
}
- do_unlink(fnametmp);
} else {
rprintf(FERROR,"rename %s -> %s : %s\n",
fnametmp,fname,strerror(errno));
- do_unlink(fnametmp);
}
+ do_unlink(fnametmp);
} else {
set_perms(fname,file,NULL,0);
}