maxname = MIN(MAXPATHLEN - 7 - length, NAME_MAX - 8);
if (maxname < 1) {
- rprintf(FERROR, "temporary filename too long: %s\n",
- safe_fname(fname));
+ rprintf(FERROR, "temporary filename too long: %s\n", fname);
fnametmp[0] = '\0';
return 0;
}
mapbuf = map_file(fd_r, size_r, read_size, sum.blength);
if (verbose > 2) {
rprintf(FINFO, "recv mapped %s of size %.0f\n",
- safe_fname(fname_r), (double)size_r);
+ fname_r, (double)size_r);
}
} else
mapbuf = NULL;
for (i = -1; (i = next_delayed_bit(i)) >= 0; ) {
struct file_struct *file = flist->files[i];
- fname = local_name ? local_name : f_name(file);
+ fname = local_name ? local_name : f_name(file, NULL);
if ((partialptr = partial_dir_fname(fname)) != NULL) {
if (make_backups && !make_backup(fname))
continue;
if (verbose > 2) {
rprintf(FINFO, "renaming %s to %s\n",
- safe_fname(partialptr),
- safe_fname(fname));
+ partialptr, fname);
}
+ /* We don't use robust_rename() here because the
+ * partial-dir must be on the same drive. */
if (do_rename(partialptr, fname) < 0) {
rsyserr(FERROR, errno,
"rename failed for %s (from %s)",
- full_fname(fname),
- safe_fname(partialptr));
+ full_fname(fname), partialptr);
} else {
if (remove_sent_files
|| (preserve_hard_links
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS,numbuf,4);
}
- handle_partial_dir(partialptr,
- PDIR_DELETE);
+ handle_partial_dir(partialptr, PDIR_DELETE);
}
}
}
rprintf(FINFO,
"(No batched update for%s \"%s\")\n",
phase ? " resend of" : "",
- safe_fname(f_name(the_file_list->files[next_gen_i])));
+ f_name(the_file_list->files[next_gen_i], NULL));
}
next_gen_i = read_int(batch_gen_fd);
if (next_gen_i == -1)
continue;
file = flist->files[i];
- fname = local_name ? local_name : f_name_to(file, fbuf);
+ fname = local_name ? local_name : f_name(file, fbuf);
if (verbose > 2)
- rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
+ rprintf(FINFO, "recv_files(%s)\n", fname);
if (!(iflags & ITEM_TRANSFER)) {
maybe_log_item(file, iflags, itemizing, xname);
if (read_batch) {
next_gen_i = get_next_gen_i(batch_gen_fd, next_gen_i, i);
if (i < next_gen_i) {
- rprintf(FINFO, "(Skipping batched update for \"%s\")\n",
- safe_fname(fname));
+ rprintf(FINFO,
+ "(Skipping batched update for \"%s\")\n",
+ fname);
discard_receive_data(f_in, file->length);
continue;
}
fd1 = -1;
}
- if (fd1 != -1 && !preserve_perms) {
- /* 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;
+ /* If we're not preserving permissions, change the file-list's
+ * mode based on the local permissions and some heuristics. */
+ if (!preserve_perms) {
+ int exists = fd1 != -1;
+ file->mode = dest_mode(file->mode, st.st_mode, exists);
}
/* We now check to see if we are writing file "inplace" */
continue;
}
- if (partialptr)
+ if (keep_partial)
cleanup_set(fnametmp, partialptr, file, fd1, fd2);
}
if (log_before_transfer)
log_item(file, &initial_stats, iflags, NULL);
else if (!am_server && verbose && do_progress)
- rprintf(FINFO, "%s\n", safe_fname(fname));
+ rprintf(FINFO, "%s\n", fname);
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
}
if ((recv_ok && (!delay_updates || !partialptr)) || inplace) {
- finish_transfer(fname, fnametmp, file, recv_ok, 1);
- if (partialptr != fname && fnamecmp == partialptr) {
+ if (partialptr == fname || *partial_dir == '/')
+ partialptr = NULL;
+ finish_transfer(fname, fnametmp, partialptr,
+ file, recv_ok, 1);
+ if (fnamecmp == partialptr) {
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
}
} else if (keep_partial && partialptr
&& handle_partial_dir(partialptr, PDIR_CREATE)) {
- finish_transfer(partialptr, fnametmp, file, recv_ok,
- !partial_dir);
+ finish_transfer(partialptr, fnametmp, NULL,
+ file, recv_ok, !partial_dir);
if (delay_updates && recv_ok) {
set_delayed_bit(i);
recv_ok = -1;
}
rprintf(msgtype,
"%s: %s failed verification -- update %s%s.\n",
- errstr, safe_fname(fname),
- keptstr, redostr);
+ errstr, fname, keptstr, redostr);
}
if (!phase) {
SIVAL(numbuf, 0, i);