diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
commit | 1b816ea846aca3ee89e7995373ace609e9518424 (patch) | |
tree | b41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /progressmeter.c | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'progressmeter.c')
-rw-r--r-- | progressmeter.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/progressmeter.c b/progressmeter.c index 13c51d87e..0f95222d2 100644 --- a/progressmeter.c +++ b/progressmeter.c | |||
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: progressmeter.c,v 1.37 2006/08/03 03:34:42 deraadt Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2003 Nils Nordman. All rights reserved. | 3 | * Copyright (c) 2003 Nils Nordman. All rights reserved. |
3 | * | 4 | * |
@@ -23,7 +24,17 @@ | |||
23 | */ | 24 | */ |
24 | 25 | ||
25 | #include "includes.h" | 26 | #include "includes.h" |
26 | RCSID("$OpenBSD: progressmeter.c,v 1.24 2005/06/07 13:25:23 jaredy Exp $"); | 27 | |
28 | #include <sys/types.h> | ||
29 | #include <sys/ioctl.h> | ||
30 | #include <sys/uio.h> | ||
31 | |||
32 | #include <errno.h> | ||
33 | #include <signal.h> | ||
34 | #include <stdio.h> | ||
35 | #include <string.h> | ||
36 | #include <time.h> | ||
37 | #include <unistd.h> | ||
27 | 38 | ||
28 | #include "progressmeter.h" | 39 | #include "progressmeter.h" |
29 | #include "atomicio.h" | 40 | #include "atomicio.h" |
@@ -154,7 +165,7 @@ refresh_progress_meter(void) | |||
154 | len = 0; | 165 | len = 0; |
155 | if (len >= file_len + 1) | 166 | if (len >= file_len + 1) |
156 | len = file_len; | 167 | len = file_len; |
157 | for (i = len; i < file_len; i++ ) | 168 | for (i = len; i < file_len; i++) |
158 | buf[i] = ' '; | 169 | buf[i] = ' '; |
159 | buf[file_len] = '\0'; | 170 | buf[file_len] = '\0'; |
160 | } | 171 | } |
@@ -215,6 +226,7 @@ refresh_progress_meter(void) | |||
215 | last_update = now; | 226 | last_update = now; |
216 | } | 227 | } |
217 | 228 | ||
229 | /*ARGSUSED*/ | ||
218 | static void | 230 | static void |
219 | update_progress_meter(int ignore) | 231 | update_progress_meter(int ignore) |
220 | { | 232 | { |
@@ -269,6 +281,7 @@ stop_progress_meter(void) | |||
269 | atomicio(vwrite, STDOUT_FILENO, "\n", 1); | 281 | atomicio(vwrite, STDOUT_FILENO, "\n", 1); |
270 | } | 282 | } |
271 | 283 | ||
284 | /*ARGSUSED*/ | ||
272 | static void | 285 | static void |
273 | sig_winch(int sig) | 286 | sig_winch(int sig) |
274 | { | 287 | { |