summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-02-06 16:41:37 +1100
committerDarren Tucker <dtucker@zip.com.au>2004-02-06 16:41:37 +1100
commit7f73a4955d289236119fb332f73c493d9ed85035 (patch)
treedcf77ea8bd603da250230477c2b25db50ec6f1d2
parenta8be9e23d236f0e9c27214418280b752b68dbd54 (diff)
- markus@cvs.openbsd.org 2004/02/05 15:33:33
[progressmeter.c] fix ETA for > 4GB; bugzilla #791; ok henning@ deraadt@
-rw-r--r--ChangeLog5
-rw-r--r--progressmeter.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e98126d..baebcd98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@
- dtucker@cvs.openbsd.org 2004/02/05 05:37:17
[monitor.c sshd.c]
Pass SIGALRM through to privsep child if LoginGraceTime expires. ok markus@
+ - markus@cvs.openbsd.org 2004/02/05 15:33:33
+ [progressmeter.c]
+ fix ETA for > 4GB; bugzilla #791; ok henning@ deraadt@
20040129
- (dtucker) OpenBSD CVS Sync regress/
@@ -1806,4 +1809,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3213 2004/02/06 05:40:27 dtucker Exp $
+$Id: ChangeLog,v 1.3214 2004/02/06 05:41:37 dtucker Exp $
diff --git a/progressmeter.c b/progressmeter.c
index 7b76c959..f4266852 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: progressmeter.c,v 1.18 2003/12/02 12:15:10 markus Exp $");
+RCSID("$OpenBSD: progressmeter.c,v 1.19 2004/02/05 15:33:33 markus Exp $");
#include "progressmeter.h"
#include "atomicio.h"
@@ -107,7 +107,7 @@ refresh_progress_meter(void)
off_t transferred;
double elapsed;
int percent;
- int bytes_left;
+ off_t bytes_left;
int cur_speed;
int hours, minutes, seconds;
int i, len;