X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c55f70218c2f5f292bdef2bb6ecb16408eb35f44..f0359dd00d60d72c4b3dec85de8e490692f6015c:/receiver.c diff --git a/receiver.c b/receiver.c index bf0877b3..b10f7c61 100644 --- a/receiver.c +++ b/receiver.c @@ -108,13 +108,14 @@ void delete_files(struct file_list *flist) int i, j; char *name; extern int module_id; + extern int ignore_errors; extern int max_delete; static int deletion_count; if (cvs_exclude) add_cvs_excludes(); - if (io_error && !lp_ignore_errors(module_id)) { + if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) { rprintf(FINFO,"IO error encountered - skipping file deletion\n"); return; } @@ -269,7 +270,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname, offset += len; } - end_progress(); + end_progress(total_size); if (fd != -1 && offset > 0 && sparse_end(fd) != 0) { rprintf(FERROR,"write failed on %s : %s\n",