extern int remote_version;
extern char *backup_suffix;
+extern char *tmpdir;
extern int whole_file;
extern int block_size;
return;
}
- if (update_only && st.st_mtime >= file->modtime) {
+ if (update_only && st.st_mtime > file->modtime) {
if (verbose > 1)
fprintf(FERROR,"%s is newer\n",fname);
return;
close(fd1);
continue;
}
- sprintf(fnametmp,"%s.XXXXXX",fname);
+ if (tmpdir) {
+ char *f;
+ f = strrchr(fname,'/');
+ if (f == NULL)
+ f = fname;
+ else
+ f++;
+ sprintf(fnametmp,"%s/%s.XXXXXX",tmpdir,f);
+ } else {
+ sprintf(fnametmp,"%s.XXXXXX",fname);
+ }
if (NULL == mktemp(fnametmp)) {
fprintf(FERROR,"mktemp %s failed\n",fnametmp);
receive_data(f_in,buf,-1,NULL);
close(fd1);
continue;
}
- fd2 = open(fnametmp,O_WRONLY|O_CREAT,file->mode);
+ fd2 = open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
if (fd2 == -1 && relative_paths && errno == ENOENT &&
create_directory_path(fnametmp) == 0) {
- fd2 = open(fnametmp,O_WRONLY|O_CREAT,file->mode);
+ fd2 = open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
}
if (fd2 == -1) {
fprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
/* move tmp file over real file */
if (rename(fnametmp,fname) != 0) {
- fprintf(FERROR,"rename %s -> %s : %s\n",
- fnametmp,fname,strerror(errno));
- unlink(fnametmp);
+ if (errno == EXDEV) {
+ /* rename failed on cross-filesystem link.
+ Copy the file instead. */
+ if (copy_file(fnametmp,fname, file->mode)) {
+ fprintf(FERROR,"copy %s -> %s : %s\n",
+ fnametmp,fname,strerror(errno));
+ } else {
+ set_perms(fname,file,NULL,0);
+ }
+ unlink(fnametmp);
+ } else {
+ fprintf(FERROR,"rename %s -> %s : %s\n",
+ fnametmp,fname,strerror(errno));
+ unlink(fnametmp);
+ }
+ } else {
+ set_perms(fname,file,NULL,0);
}
cleanup_fname = NULL;
- set_perms(fname,file,NULL,0);
if (!recv_ok) {
if (verbose > 1)