From 166aa723324aac5102506159489e29ed31411d4b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 25 Jan 2000 06:39:33 +0000 Subject: [PATCH] patch from David Murn to make sure the final 100% is always printed when using --progress --- match.c | 2 +- receiver.c | 2 +- util.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/match.c b/match.c index 86a04bed..1c0e894f 100644 --- a/match.c +++ b/match.c @@ -122,7 +122,7 @@ static void matched(int f,struct sum_struct *s,struct map_struct *buf, if (buf) show_progress(last_match, buf->file_size); - if (i == -1) end_progress(); + if (i == -1) end_progress(buf->file_size); } diff --git a/receiver.c b/receiver.c index bf0877b3..b9199f2b 100644 --- a/receiver.c +++ b/receiver.c @@ -269,7 +269,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", diff --git a/util.c b/util.c index 078d59f5..4382300e 100644 --- a/util.c +++ b/util.c @@ -767,12 +767,12 @@ int u_strcmp(const char *cs1, const char *cs2) static OFF_T last_ofs; -void end_progress(void) +void end_progress(OFF_T size) { extern int do_progress, am_server; if (do_progress && !am_server) { - rprintf(FINFO,"\n"); + rprintf(FINFO,"%.0f (100%%)\n", (double)size); } last_ofs = 0; } -- 2.34.1