summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--progressmeter.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f3ab7cfba..8a978ec04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120031121
2 - (djm) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2003/11/20 11:39:28
4 [progressmeter.c]
5 fix rounding errors; from andreas@
6
120031118 720031118
2 - (djm) Fix early exit for root auth success when UsePAM=yes and 8 - (djm) Fix early exit for root auth success when UsePAM=yes and
3 PermitRootLogin=no 9 PermitRootLogin=no
@@ -1488,4 +1494,4 @@
1488 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1494 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1489 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1495 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1490 1496
1491$Id: ChangeLog,v 1.3117 2003/11/18 11:01:48 djm Exp $ 1497$Id: ChangeLog,v 1.3118 2003/11/21 12:09:10 djm Exp $
diff --git a/progressmeter.c b/progressmeter.c
index a244acf96..39940bd9a 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: progressmeter.c,v 1.16 2003/09/23 20:18:52 markus Exp $"); 26RCSID("$OpenBSD: progressmeter.c,v 1.17 2003/11/20 11:39:28 markus Exp $");
27 27
28#include "progressmeter.h" 28#include "progressmeter.h"
29#include "atomicio.h" 29#include "atomicio.h"
@@ -80,7 +80,7 @@ format_rate(char *buf, int size, off_t bytes)
80 bytes = (bytes + 512) / 1024; 80 bytes = (bytes + 512) / 1024;
81 } 81 }
82 snprintf(buf, size, "%3lld.%1lld%c%s", 82 snprintf(buf, size, "%3lld.%1lld%c%s",
83 (int64_t) bytes / 100, 83 (int64_t) (bytes + 5) / 100,
84 (int64_t) (bytes + 5) / 10 % 10, 84 (int64_t) (bytes + 5) / 10 % 10,
85 unit[i], 85 unit[i],
86 i ? "B" : " "); 86 i ? "B" : " ");