tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/09/19 00:24:52 

[progressmeter.c]
     store the initial file offset so the progress meter doesn't freak out
     when resuming sftp transfers. bz#2137; patch from Iain Morgan; ok dtucker@
This commit is contained in:
Darren Tucker 2013-10-10 10:25:09 +11:00
parent ad92df7e5e
commit 5d80e4522d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -5,6 +5,10 @@
Remove gssapi config parts from ssh_config, as was already done for Remove gssapi config parts from ssh_config, as was already done for
sshd_config. Req by/ok ajacoutot@ sshd_config. Req by/ok ajacoutot@
ID SYNC ONLY for portable; kerberos/gssapi is still pretty popular ID SYNC ONLY for portable; kerberos/gssapi is still pretty popular
- djm@cvs.openbsd.org 2013/09/19 00:24:52
[progressmeter.c]
store the initial file offset so the progress meter doesn't freak out
when resuming sftp transfers. bz#2137; patch from Iain Morgan; ok dtucker@`
20131009 20131009
- (djm) [openbsd-compat/arc4random.c openbsd-compat/chacha_private.h] Pull - (djm) [openbsd-compat/arc4random.c openbsd-compat/chacha_private.h] Pull

8
progressmeter.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: progressmeter.c,v 1.39 2013/06/02 13:33:05 dtucker Exp $ */ /* $OpenBSD: progressmeter.c,v 1.40 2013/09/19 00:24:52 djm Exp $ */
/* /*
* Copyright (c) 2003 Nils Nordman. All rights reserved. * Copyright (c) 2003 Nils Nordman. All rights reserved.
* *
@ -66,6 +66,7 @@ static void update_progress_meter(int);
static time_t start; /* start progress */ static time_t start; /* start progress */
static time_t last_update; /* last progress update */ static time_t last_update; /* last progress update */
static char *file; /* name of the file being transferred */ static char *file; /* name of the file being transferred */
static off_t start_pos; /* initial position of transfer */
static off_t end_pos; /* ending position of transfer */ static off_t end_pos; /* ending position of transfer */
static off_t cur_pos; /* transfer position as of last refresh */ static off_t cur_pos; /* transfer position as of last refresh */
static volatile off_t *counter; /* progress counter */ static volatile off_t *counter; /* progress counter */
@ -129,7 +130,7 @@ refresh_progress_meter(void)
int i, len; int i, len;
int file_len; int file_len;
transferred = *counter - cur_pos; transferred = *counter - (cur_pos ? cur_pos : start_pos);
cur_pos = *counter; cur_pos = *counter;
now = monotime(); now = monotime();
bytes_left = end_pos - cur_pos; bytes_left = end_pos - cur_pos;
@ -139,7 +140,7 @@ refresh_progress_meter(void)
else { else {
elapsed = now - start; elapsed = now - start;
/* Calculate true total speed when done */ /* Calculate true total speed when done */
transferred = end_pos; transferred = end_pos - start_pos;
bytes_per_second = 0; bytes_per_second = 0;
} }
@ -251,6 +252,7 @@ start_progress_meter(char *f, off_t filesize, off_t *ctr)
{ {
start = last_update = monotime(); start = last_update = monotime();
file = f; file = f;
start_pos = *ctr;
end_pos = filesize; end_pos = filesize;
cur_pos = 0; cur_pos = 0;
counter = ctr; counter = ctr;