diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | progressmeter.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -21,6 +21,9 @@ | |||
21 | - dtucker@cvs.openbsd.org 2004/02/05 05:37:17 | 21 | - dtucker@cvs.openbsd.org 2004/02/05 05:37:17 |
22 | [monitor.c sshd.c] | 22 | [monitor.c sshd.c] |
23 | Pass SIGALRM through to privsep child if LoginGraceTime expires. ok markus@ | 23 | Pass SIGALRM through to privsep child if LoginGraceTime expires. ok markus@ |
24 | - markus@cvs.openbsd.org 2004/02/05 15:33:33 | ||
25 | [progressmeter.c] | ||
26 | fix ETA for > 4GB; bugzilla #791; ok henning@ deraadt@ | ||
24 | 27 | ||
25 | 20040129 | 28 | 20040129 |
26 | - (dtucker) OpenBSD CVS Sync regress/ | 29 | - (dtucker) OpenBSD CVS Sync regress/ |
@@ -1806,4 +1809,4 @@ | |||
1806 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1809 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1807 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1810 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1808 | 1811 | ||
1809 | $Id: ChangeLog,v 1.3213 2004/02/06 05:40:27 dtucker Exp $ | 1812 | $Id: ChangeLog,v 1.3214 2004/02/06 05:41:37 dtucker Exp $ |
diff --git a/progressmeter.c b/progressmeter.c index 7b76c959e..f42668526 100644 --- a/progressmeter.c +++ b/progressmeter.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: progressmeter.c,v 1.18 2003/12/02 12:15:10 markus Exp $"); | 26 | RCSID("$OpenBSD: progressmeter.c,v 1.19 2004/02/05 15:33:33 markus Exp $"); |
27 | 27 | ||
28 | #include "progressmeter.h" | 28 | #include "progressmeter.h" |
29 | #include "atomicio.h" | 29 | #include "atomicio.h" |
@@ -107,7 +107,7 @@ refresh_progress_meter(void) | |||
107 | off_t transferred; | 107 | off_t transferred; |
108 | double elapsed; | 108 | double elapsed; |
109 | int percent; | 109 | int percent; |
110 | int bytes_left; | 110 | off_t bytes_left; |
111 | int cur_speed; | 111 | int cur_speed; |
112 | int hours, minutes, seconds; | 112 | int hours, minutes, seconds; |
113 | int i, len; | 113 | int i, len; |