- if (!recv_ok) {
- if (csum_length == SUM_LENGTH) {
- rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
- full_fname(fname));
- } else {
- char buf[4];
- if (verbose > 1)
- rprintf(FINFO,"redoing %s(%d)\n",fname,i);
- SIVAL(buf, 0, i);
- send_msg(MSG_REDO, buf, 4);
+ if (recv_ok > 0) {
+ if (remove_sent_files
+ || (preserve_hard_links && file->link_u.links)) {
+ SIVAL(numbuf, 0, i);
+ send_msg(MSG_SUCCESS, numbuf, 4);
+ }
+ } else if (!recv_ok) {
+ int msgtype = csum_length == SUM_LENGTH || read_batch ?
+ FERROR : FINFO;
+ if (msgtype == FERROR || verbose) {
+ char *errstr, *redostr, *keptstr;
+ if (!(keep_partial && partialptr) && !inplace)
+ keptstr = "discarded";
+ else if (partial_dir)
+ keptstr = "put into partial-dir";
+ else
+ keptstr = "retained";
+ if (msgtype == FERROR) {
+ errstr = "ERROR";
+ redostr = "";
+ } else {
+ errstr = "WARNING";
+ redostr = " (will try again)";
+ }
+ rprintf(msgtype,
+ "%s: %s failed verification -- update %s%s.\n",
+ errstr, safe_fname(fname),
+ keptstr, redostr);
+ }
+ if (csum_length != SUM_LENGTH) {
+ SIVAL(numbuf, 0, i);
+ send_msg(MSG_REDO, numbuf, 4);
+ }
+ }
+ }
+ make_backups = save_make_backups;
+
+ if (delay_updates) {
+ for (i = -1; (i = next_delayed_bit(i)) >= 0; ) {
+ struct file_struct *file = flist->files[i];
+ fname = local_name ? local_name : f_name(file);
+ partialptr = partial_dir_fname(fname);
+ if (partialptr) {
+ if (make_backups && !make_backup(fname))
+ continue;
+ if (verbose > 2) {
+ rprintf(FINFO, "renaming %s to %s\n",
+ safe_fname(partialptr),
+ safe_fname(fname));
+ }
+ if (do_rename(partialptr, fname) < 0) {
+ rsyserr(FERROR, errno,
+ "rename failed for %s (from %s)",
+ full_fname(fname),
+ safe_fname(partialptr));
+ } else {
+ if (remove_sent_files
+ || (preserve_hard_links
+ && file->link_u.links)) {
+ SIVAL(numbuf, 0, i);
+ send_msg(MSG_SUCCESS,numbuf,4);
+ }
+ handle_partial_dir(partialptr,
+ PDIR_DELETE);
+ }