fname = local_name;
if (dry_run) {
- if (!am_server) {
- log_transfer(file, fname);
+ if (!am_server && verbose) { /* log transfer */
+ rprintf(FINFO, "%s\n", fname);
}
continue;
}
}
if (fd1 != -1 && !preserve_perms) {
- /* if the file exists already and we aren't perserving
- presmissions then act as though the remote end sent
+ /* if the file exists already and we aren't preserving
+ permissions then act as though the remote end sent
us the file permissions we already have */
file->mode = st.st_mode;
}
this out. We also set it initially without group
access because of a similar race condition. */
fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
- if (fd2 == -1) {
- rprintf(FERROR,"mkstemp %s failed: %s\n",fnametmp,strerror(errno));
- receive_data(f_in,buf,-1,NULL,file->length);
- if (buf) unmap_file(buf);
- if (fd1 != -1) close(fd1);
- continue;
- }
/* in most cases parent directories will already exist
because their information should have been previously
fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
}
if (fd2 == -1) {
- rprintf(FERROR,"cannot create %s : %s\n",fnametmp,strerror(errno));
+ rprintf(FERROR,"mkstemp %s failed: %s\n",fnametmp,strerror(errno));
receive_data(f_in,buf,-1,NULL,file->length);
if (buf) unmap_file(buf);
if (fd1 != -1) close(fd1);
cleanup_set(fnametmp, fname, file, buf, fd1, fd2);
- if (!am_server) {
- log_transfer(file, fname);
+ if (!am_server && verbose) { /* log transfer */
+ rprintf(FINFO, "%s\n", fname);
}
/* recv file data */