-int recv_files(int f_in,struct file_list *flist,char *local_name)
-{
- int fd1,fd2;
- struct stat st;
- char *fname;
- char fnametmp[MAXPATHLEN];
- char *buf;
- int i;
- struct file_struct *file;
-
- if (verbose > 2) {
- fprintf(FERROR,"recv_files(%d) starting\n",flist->count);
- }
-
- if (recurse && delete_mode && !local_name && flist->count>0) {
- delete_files(flist);
- }
-
- while (1)
- {
- i = read_int(f_in);
- if (i == -1) break;
-
- file = &flist->files[i];
- fname = file->name;
-
- if (local_name)
- fname = local_name;
-
- if (dry_run) {
- if (!am_server && verbose)
- printf("%s\n",fname);
- continue;
- }
-
- if (verbose > 2)
- fprintf(FERROR,"recv_files(%s)\n",fname);
-
- /* open the file */
- fd1 = open(fname,O_RDONLY);
-
- if (fd1 != -1 && fstat(fd1,&st) != 0) {
- fprintf(FERROR,"fstat %s : %s\n",fname,strerror(errno));
- close(fd1);
- return -1;
- }
-
- if (fd1 != -1 && !S_ISREG(st.st_mode)) {
- fprintf(FERROR,"%s : not a regular file\n",fname);
- close(fd1);
- return -1;
- }
-
- if (fd1 != -1 && st.st_size > 0) {
- buf = map_file(fd1,st.st_size);
- } else {
- buf = NULL;
- }
-
- if (verbose > 2)
- fprintf(FERROR,"mapped %s of size %d\n",fname,(int)st.st_size);
-
- /* open tmp file */
- sprintf(fnametmp,"%s.XXXXXX",fname);
- if (NULL == mktemp(fnametmp)) {
- fprintf(FERROR,"mktemp %s failed\n",fnametmp);
- return -1;
- }
- fd2 = open(fnametmp,O_WRONLY|O_CREAT,file->mode);
- if (fd2 == -1) {
- fprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
- return -1;
- }
-
- cleanup_fname = fnametmp;
-
- if (!am_server && verbose)
- printf("%s\n",fname);
-
- /* recv file data */
- receive_data(f_in,buf,fd2,fname);
-
- if (fd1 != -1) {
- unmap_file(buf,st.st_size);
- close(fd1);
- }
- close(fd2);
-
- if (verbose > 2)
- fprintf(FERROR,"renaming %s to %s\n",fnametmp,fname);
-
- if (make_backups) {
- char fnamebak[MAXPATHLEN];
- sprintf(fnamebak,"%s%s",fname,backup_suffix);
- if (rename(fname,fnamebak) != 0 && errno != ENOENT) {
- fprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
- exit_cleanup(1);
+/* finish off a file transfer, renaming the file and setting the permissions
+ and ownership */
+void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
+{
+ int ret;
+
+ if (make_backups && !make_backup(fname))
+ return;
+
+ /* move tmp file over real file */
+ ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
+ if (ret < 0) {
+ rprintf(FERROR, "%s %s -> \"%s\": %s\n",
+ ret == -2 ? "copy" : "rename",
+ full_fname(fnametmp), fname, strerror(errno));
+ do_unlink(fnametmp);
+ } else {
+ set_perms(fname,file,NULL,0);