X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8e41b68e8f975c02a5d9281be780ba5d1a385107..ec8637f3679b891041c798400774141024e24a4e:/sender.c diff --git a/sender.c b/sender.c index e9c48da9..fc9c47cb 100644 --- a/sender.c +++ b/sender.c @@ -265,7 +265,8 @@ void send_files(int f_in, int f_out) updating_basis_file = inplace && (protocol_version >= 29 ? fnamecmp_type == FNAMECMP_FNAME : make_backups <= 0); - stats.current_file_index = ndx; + if (!am_server && do_progress) + set_current_file_index(file, ndx); stats.num_transferred_files++; stats.total_transferred_size += F_LENGTH(file); @@ -289,13 +290,13 @@ void send_files(int f_in, int f_out) if (errno == ENOENT) { enum logcode c = am_daemon && protocol_version < 28 ? FERROR - : FINFO; + : FWARNING; io_error |= IOERR_VANISHED; rprintf(c, "file has vanished: %s\n", full_fname(fname)); } else { io_error |= IOERR_GENERAL; - rsyserr(FERROR, errno, + rsyserr(FERROR_XFER, errno, "send_files failed to open %s", full_fname(fname)); } @@ -349,7 +350,7 @@ void send_files(int f_in, int f_out) j = unmap_file(mbuf); if (j) { io_error |= IOERR_GENERAL; - rsyserr(FERROR, j, + rsyserr(FERROR_XFER, j, "read errors mapping %s", full_fname(fname)); }