Explicitly check for 100% completion to avoid potential floating point
authordtucker <dtucker@openbsd.org>
Thu, 30 Jun 2016 05:17:05 +0000 (05:17 +0000)
committerdtucker <dtucker@openbsd.org>
Thu, 30 Jun 2016 05:17:05 +0000 (05:17 +0000)
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@

usr.bin/ssh/progressmeter.c

index d9af403..3220e2c 100644 (file)
@@ -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.
  *
@@ -169,10 +169,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);