diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-07-17 16:12:08 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-07-17 16:12:08 +1000 |
commit | fc9597034b819b295966f61d8dc797b53fda45c7 (patch) | |
tree | a5a9b7afc50720d7b6f89a4ae1f211abbff89f47 /progressmeter.c | |
parent | ba6de952a00558e6d93b8c9edd81806a99716411 (diff) |
- deraadt@cvs.openbsd.org 2004/07/11 17:48:47
[channels.c cipher.c clientloop.c clientloop.h compat.h moduli.c
readconf.c nchan.c pathnames.h progressmeter.c readconf.h servconf.c
session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h
sshd.c ttymodes.h]
spaces
Diffstat (limited to 'progressmeter.c')
-rw-r--r-- | progressmeter.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/progressmeter.c b/progressmeter.c index 629a536b2..93f5a3e62 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.21 2004/06/21 17:36:31 avsm Exp $"); | 26 | RCSID("$OpenBSD: progressmeter.c,v 1.22 2004/07/11 17:48:47 deraadt Exp $"); |
27 | 27 | ||
28 | #include "progressmeter.h" | 28 | #include "progressmeter.h" |
29 | #include "atomicio.h" | 29 | #include "atomicio.h" |
@@ -48,15 +48,15 @@ void refresh_progress_meter(void); | |||
48 | /* signal handler for updating the progress meter */ | 48 | /* signal handler for updating the progress meter */ |
49 | static void update_progress_meter(int); | 49 | static void update_progress_meter(int); |
50 | 50 | ||
51 | static time_t start; /* start progress */ | 51 | static time_t start; /* start progress */ |
52 | static time_t last_update; /* last progress update */ | 52 | static time_t last_update; /* last progress update */ |
53 | static char *file; /* name of the file being transferred */ | 53 | static char *file; /* name of the file being transferred */ |
54 | static off_t end_pos; /* ending position of transfer */ | 54 | static off_t end_pos; /* ending position of transfer */ |
55 | static off_t cur_pos; /* transfer position as of last refresh */ | 55 | static off_t cur_pos; /* transfer position as of last refresh */ |
56 | static volatile off_t *counter; /* progress counter */ | 56 | static volatile off_t *counter; /* progress counter */ |
57 | static long stalled; /* how long we have been stalled */ | 57 | static long stalled; /* how long we have been stalled */ |
58 | static int bytes_per_second; /* current speed in bytes per second */ | 58 | static int bytes_per_second; /* current speed in bytes per second */ |
59 | static int win_size; /* terminal window size */ | 59 | static int win_size; /* terminal window size */ |
60 | 60 | ||
61 | /* units for format_size */ | 61 | /* units for format_size */ |
62 | static const char unit[] = " KMGT"; | 62 | static const char unit[] = " KMGT"; |