diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /progressmeter.c | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'progressmeter.c')
-rw-r--r-- | progressmeter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/progressmeter.c b/progressmeter.c index 0f95222d2..332bd3c99 100644 --- a/progressmeter.c +++ b/progressmeter.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: progressmeter.c,v 1.37 2006/08/03 03:34:42 deraadt Exp $ */ | 1 | /* $OpenBSD: progressmeter.c,v 1.39 2013/06/02 13:33:05 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2003 Nils Nordman. All rights reserved. | 3 | * Copyright (c) 2003 Nils Nordman. All rights reserved. |
4 | * | 4 | * |
@@ -131,7 +131,7 @@ refresh_progress_meter(void) | |||
131 | 131 | ||
132 | transferred = *counter - cur_pos; | 132 | transferred = *counter - cur_pos; |
133 | cur_pos = *counter; | 133 | cur_pos = *counter; |
134 | now = time(NULL); | 134 | now = monotime(); |
135 | bytes_left = end_pos - cur_pos; | 135 | bytes_left = end_pos - cur_pos; |
136 | 136 | ||
137 | if (bytes_left > 0) | 137 | if (bytes_left > 0) |
@@ -249,7 +249,7 @@ update_progress_meter(int ignore) | |||
249 | void | 249 | void |
250 | start_progress_meter(char *f, off_t filesize, off_t *ctr) | 250 | start_progress_meter(char *f, off_t filesize, off_t *ctr) |
251 | { | 251 | { |
252 | start = last_update = time(NULL); | 252 | start = last_update = monotime(); |
253 | file = f; | 253 | file = f; |
254 | end_pos = filesize; | 254 | end_pos = filesize; |
255 | cur_pos = 0; | 255 | cur_pos = 0; |