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 /progressmeter.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 'progressmeter.c')
| -rw-r--r-- | progressmeter.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/progressmeter.c b/progressmeter.c index add462dde..e385c1254 100644 --- a/progressmeter.c +++ b/progressmeter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: progressmeter.c,v 1.46 2019/01/23 08:01:46 dtucker Exp $ */ +/* $OpenBSD: progressmeter.c,v 1.47 2019/01/24 16:52:17 dtucker Exp $ */ /* * Copyright (c) 2003 Nils Nordman. All rights reserved. * @@ -59,9 +59,6 @@ static void format_rate(char *, int, off_t); static void sig_winch(int); static void setscreensize(void); -/* updates the progressmeter to reflect the current state of the transfer */ -void refresh_progress_meter(void); - /* signal handler for updating the progress meter */ static void sig_alarm(int); @@ -120,7 +117,7 @@ format_size(char *buf, int size, off_t bytes) } void -refresh_progress_meter(void) +refresh_progress_meter(int force_update) { char buf[MAX_WINSIZE + 1]; off_t transferred; @@ -131,7 +128,7 @@ refresh_progress_meter(void) int hours, minutes, seconds; int file_len; - if ((!alarm_fired && !win_resized) || !can_output()) + if ((!force_update && !alarm_fired && !win_resized) || !can_output()) return; alarm_fired = 0; @@ -254,7 +251,7 @@ start_progress_meter(const char *f, off_t filesize, off_t *ctr) bytes_per_second = 0; setscreensize(); - refresh_progress_meter(); + refresh_progress_meter(1); signal(SIGALRM, sig_alarm); signal(SIGWINCH, sig_winch); @@ -271,7 +268,7 @@ stop_progress_meter(void) /* Ensure we complete the progress */ if (cur_pos != end_pos) - refresh_progress_meter(); + refresh_progress_meter(1); atomicio(vwrite, STDOUT_FILENO, "\n", 1); } |