summaryrefslogtreecommitdiff
path: root/scp.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-01-24 16:52:17 +0000
committerColin Watson <cjwatson@debian.org>2019-02-08 15:40:25 +0000
commit2a8f710447442e9a03e71c022859112ec2d77d17 (patch)
tree49dd4da67192337cbe77a88bf5a076494a779837 /scp.c
parent11b88754cadcad0ba79b4ffcc127223248dccb54 (diff)
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 Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=bdc6c63c80b55bcbaa66b5fde31c1cb1d09a41eb Last-Update: 2019-02-08 Patch-Name: have-progressmeter-force-update-at-beginning-and-end-transfer.patch
Diffstat (limited to 'scp.c')
-rw-r--r--scp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scp.c b/scp.c
index 80308573c..1971c80cd 100644
--- a/scp.c
+++ b/scp.c
@@ -593,7 +593,7 @@ scpio(void *_cnt, size_t s)
593 off_t *cnt = (off_t *)_cnt; 593 off_t *cnt = (off_t *)_cnt;
594 594
595 *cnt += s; 595 *cnt += s;
596 refresh_progress_meter(); 596 refresh_progress_meter(0);
597 if (limit_kbps > 0) 597 if (limit_kbps > 0)
598 bandwidth_limit(&bwlimit, s); 598 bandwidth_limit(&bwlimit, s);
599 return 0; 599 return 0;