From 0394e34a69e7051012125dc4e49d8d928ce15290 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 5 Mar 2005 17:51:23 +0000 Subject: Moved the end_progress() call from match.c to sender.c so that we report progress on 0-length files when pushing files (the receiver already called it, so we already produced progress on a 0-length file when pulling). --- match.c | 6 +----- sender.c | 3 +++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/match.c b/match.c index 89e5c529..00a38aa4 100644 --- a/match.c +++ b/match.c @@ -133,12 +133,8 @@ static void matched(int f, struct sum_struct *s, struct map_struct *buf, else last_match = offset; - if (buf && do_progress) { + if (buf && do_progress) show_progress(last_match, buf->file_size); - - if (i == -1) - end_progress(buf->file_size); - } } diff --git a/sender.c b/sender.c index 4d8fe2cb..39988225 100644 --- a/sender.c +++ b/sender.c @@ -325,6 +325,9 @@ void send_files(struct file_list *flist, int f_out, int f_in) set_compression(fname); match_sums(f_out, s, mbuf, st.st_size); + if (do_progress) + end_progress(st.st_size); + if (!log_before_transfer) log_item(file, &initial_stats, iflags, NULL); -- cgit v1.2.3