Commit 166aa723 authored by Andrew Tridgell's avatar Andrew Tridgell

patch from David Murn to make sure the final 100% is always printed

when using --progress
parent f9f6184f
......@@ -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);
}
......
......@@ -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",
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment