rsyserr(FERROR, errno, "delete_one: unlink %s failed",
full_fname(fn));
} else if (verbose)
- rprintf(FINFO, "deleting %s\n", fn);
+ rprintf(FINFO, "deleting %s\n", safe_fname(fn));
} else {
if (do_rmdir(fn) != 0) {
if (errno == ENOTDIR && keep_dirlinks) {
"delete_one: rmdir %s failed",
full_fname(fn));
}
- } else if (verbose)
- rprintf(FINFO, "deleting directory %s\n", fn);
+ } else if (verbose) {
+ rprintf(FINFO, "deleting directory %s\n",
+ safe_fname(fn));
+ }
}
}
continue;
if (verbose > 1)
- rprintf(FINFO, "deleting in %s\n", fbuf);
+ rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf));
for (i = local_file_list->count-1; i >= 0; i--) {
if (max_delete && deletion_count > max_delete)
char *f = f_name(local_file_list->files[i]);
if (make_backups && (backup_dir || !is_backup_file(f))) {
make_backup(f);
- if (verbose)
- rprintf(FINFO, "deleting %s\n", f);
+ if (verbose) {
+ rprintf(FINFO, "deleting %s\n",
+ safe_fname(f));
+ }
} else {
int mode = local_file_list->files[i]->mode;
delete_one(f, S_ISDIR(mode) != 0);
mapbuf = map_file(fd_r, size_r, sum.blength);
if (verbose > 2) {
rprintf(FINFO, "recv mapped %s of size %.0f\n",
- fname_r, (double)size_r);
+ safe_fname(fname_r), (double)size_r);
}
} else
mapbuf = NULL;
sum_update(map,len);
}
- if (!inplace || offset != offset2) {
- if (fd != -1 && write_file(fd, map, len) != (int)len) {
- rsyserr(FERROR, errno, "write failed on %s",
- full_fname(fname));
- exit_cleanup(RERR_FILEIO);
- }
- } else {
- flush_write_file(fd);
- if (do_lseek(fd,(OFF_T)len,SEEK_CUR) != offset+len) {
- rprintf(FERROR, "lseek failed on %s: %s, %lli, %lli, %i\n",
- full_fname(fname), strerror(errno),
- do_lseek(fd, 0, SEEK_CUR),
- offset + len, i);
- exit_cleanup(RERR_FILEIO);
+ if (inplace) {
+ if (offset == offset2 && fd != -1) {
+ flush_write_file(fd);
+ offset += len;
+ if (do_lseek(fd, len, SEEK_CUR) != offset) {
+ rsyserr(FERROR, errno,
+ "lseek failed on %s",
+ full_fname(fname));
+ exit_cleanup(RERR_FILEIO);
+ }
+ continue;
}
}
+ if (fd != -1 && write_file(fd, map, len) != (int)len) {
+ rsyserr(FERROR, errno, "write failed on %s",
+ full_fname(fname));
+ exit_cleanup(RERR_FILEIO);
+ }
offset += len;
}
flush_write_file(fd);
#ifdef HAVE_FTRUNCATE
- if (inplace)
+ if (inplace && fd != -1)
ftruncate(fd, offset);
#endif
fname = f_name_to(file, fbuf);
if (dry_run) {
- if (!am_server && verbose)
- rprintf(FINFO, "%s\n", fname);
+ if (!am_server && verbose) /* log the transfer */
+ rprintf(FINFO, "%s\n", safe_fname(fname));
continue;
}
initial_stats = stats;
if (verbose > 2)
- rprintf(FINFO,"recv_files(%s)\n",fname);
+ rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
fnamecmp = fname;
}
if (i < next_gen_i) {
rprintf(FINFO, "skipping update for \"%s\"\n",
- fname);
+ safe_fname(fname));
discard_receive_data(f_in, file->length);
continue;
}
if (verbose) {
rprintf(FINFO,
"skipping server-excluded update for \"%s\"\n",
- fname);
+ safe_fname(fname));
}
discard_receive_data(f_in, file->length);
continue;
cleanup_set(fnametmp, fname, file, fd1, fd2);
}
- if (!am_server && verbose)
- rprintf(FINFO, "%s\n", fname);
+ if (!am_server && verbose) /* log the transfer */
+ rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
exit_cleanup(RERR_FILEIO);
}
- if (recv_ok || keep_partial)
+ if (recv_ok || keep_partial || inplace)
finish_transfer(fname, fnametmp, file, recv_ok);
else
do_unlink(fnametmp);
cleanup_disable();
if (!recv_ok) {
- if (csum_length == SUM_LENGTH) {
- rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
- full_fname(fname));
- } else {
+ int msgtype = csum_length == SUM_LENGTH || read_batch ?
+ FERROR : FINFO;
+ if (msgtype == FERROR || verbose) {
+ char *errstr, *redostr;
+ char *keptstr = keep_partial || inplace ?
+ "retain" : "discard";
+ if (msgtype == FERROR) {
+ errstr = "ERROR";
+ redostr = "";
+ } else {
+ errstr = "WARNING";
+ redostr = " (will try again)";
+ }
+ rprintf(msgtype,
+ "%s: %s failed verification -- update %sed%s.\n",
+ errstr, safe_fname(fname),
+ keptstr, redostr);
+ }
+ if (csum_length != SUM_LENGTH) {
char buf[4];
- if (verbose > 1)
- rprintf(FINFO,"redoing %s(%d)\n",fname,i);
SIVAL(buf, 0, i);
send_msg(MSG_REDO, buf, 4);
}
}
make_backups = save_make_backups;
- if (delete_after && recurse && delete_mode && !local_name
- && flist->count > 0)
+ if (delete_after && recurse && !local_name && flist->count > 0)
delete_files(flist);
if (verbose > 2)