diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-06-30 07:17:05 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-07-08 05:46:59 +0200 |
| commit | e683fc6f1c8c7295648dbda679df8307786ec1ce (patch) | |
| tree | 9511bdd3159204478945e3f63490862e3d3b00b5 /progressmeter.c | |
| parent | upstream commit (diff) | |
| download | openssh-e683fc6f1c8c7295648dbda679df8307786ec1ce.tar.xz openssh-e683fc6f1c8c7295648dbda679df8307786ec1ce.zip | |
upstream commit
Explicitly check for 100% completion to avoid potential
floating point rounding error, which could cause progressmeter to report 99%
on completion. While there invert the test so the 100% case is clearer. with
& ok djm@
Upstream-ID: a166870c5878e422f3c71ff802e2ccd7032f715d
Diffstat (limited to 'progressmeter.c')
| -rw-r--r-- | progressmeter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/progressmeter.c b/progressmeter.c index d3e0223e5..fe9bf52e4 100644 --- a/progressmeter.c +++ b/progressmeter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: progressmeter.c,v 1.44 2016/05/30 18:34:41 schwarze Exp $ */ +/* $OpenBSD: progressmeter.c,v 1.45 2016/06/30 05:17:05 dtucker Exp $ */ /* * Copyright (c) 2003 Nils Nordman. All rights reserved. * @@ -171,10 +171,10 @@ refresh_progress_meter(void) } /* percent of transfer done */ - if (end_pos != 0) - percent = ((float)cur_pos / end_pos) * 100; - else + if (end_pos == 0 || cur_pos == end_pos) percent = 100; + else + percent = ((float)cur_pos / end_pos) * 100; snprintf(buf + strlen(buf), win_size - strlen(buf), " %3d%% ", percent); |