diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-01-24 17:52:17 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-01-24 20:32:14 +0100 |
| commit | bdc6c63c80b55bcbaa66b5fde31c1cb1d09a41eb (patch) | |
| tree | a45a5111a1f6616dd5a79544d6f0e59ca64dff30 /scp.c | |
| parent | upstream: Check for both EAGAIN and EWOULDBLOCK. This is a no-op (diff) | |
| download | openssh-bdc6c63c80b55bcbaa66b5fde31c1cb1d09a41eb.tar.xz openssh-bdc6c63c80b55bcbaa66b5fde31c1cb1d09a41eb.zip | |
upstream: Have progressmeter force an update at the beginning and
end of each transfer. Fixes the problem recently introduces where very quick
transfers do not display the progressmeter at all. Spotted by naddy@
OpenBSD-Commit-ID: 68dc46c259e8fdd4f5db3ec2a130f8e4590a7a9a
Diffstat (limited to 'scp.c')
| -rw-r--r-- | scp.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.200 2019/01/23 08:01:46 dtucker Exp $ */ +/* $OpenBSD: scp.c,v 1.201 2019/01/24 16:52:17 dtucker Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -588,7 +588,7 @@ scpio(void *_cnt, size_t s) off_t *cnt = (off_t *)_cnt; *cnt += s; - refresh_progress_meter(); + refresh_progress_meter(0); if (limit_kbps > 0) bandwidth_limit(&bwlimit, s); return 0; |