summaryrefslogtreecommitdiffstats
path: root/sftp-client.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-01-24 17:52:17 +0100
committerDarren Tucker <dtucker@dtucker.net>2019-01-24 20:32:14 +0100
commitbdc6c63c80b55bcbaa66b5fde31c1cb1d09a41eb (patch)
treea45a5111a1f6616dd5a79544d6f0e59ca64dff30 /sftp-client.c
parentupstream: Check for both EAGAIN and EWOULDBLOCK. This is a no-op (diff)
downloadopenssh-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 'sftp-client.c')
-rw-r--r--sftp-client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sftp-client.c b/sftp-client.c
index 36c4b8a4a..73e3c2f53 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.132 2019/01/23 08:01:46 dtucker Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.133 2019/01/24 16:52:17 dtucker Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -102,7 +102,7 @@ sftpio(void *_bwlimit, size_t amount)
{
struct bwlimit *bwlimit = (struct bwlimit *)_bwlimit;
- refresh_progress_meter();
+ refresh_progress_meter(0);
if (bwlimit != NULL)
bandwidth_limit(bwlimit, amount);
return 0;