[PATCH] progress: avoid empty line when breaking the progress line
- From
SZEDER Gábor <szeder.dev@gmail.com>
- Date
- May 19, 2019, 14:45 UTC
- Message-ID
- <20190519144546.9978-1-szeder.dev@gmail.com>
Since commit 545dc345eb (progress: break too long progress bar lines, 2019-04-12) when splitting a too long progress line, sometimes it looks as if a superfluous empty line were added between the title line and the counters.
To make sure that the previously displayed progress line is completely covered up when writing the new, shorter title line, we calculate how many characters need to be overwritten with spaces. Alas, this calculation doesn't account for the newline character at the end of the new title line, and resulted in printing one more space than strictly necessary. This extra space character doesn't matter, if the length of the previous progress line was shorter than the width of the terminal. However, if the previous line matched the terminal width, then this extra space made the new line longer, effectively adding that empty line after the title line.
Fix this off-by-one to avoid that spurious empty line.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> --- progress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/progress.c b/progress.c index 2d8022a622..a4da26c2aa 100644 --- a/progress.c +++ b/progress.c @@ -127,7 +127,7 @@ static void display(struct progress *progress, uint64_t n, const char *done) (int) clear_len, eol); } else if (!done && cols < progress_line_len) { clear_len = progress->title_len + 1 < cols ? - cols - progress->title_len : 0; + cols - progress->title_len - 1 : 0; fprintf(stderr, "%s:%*s\n %s%s", progress->title, (int) clear_len, "", counters_sb->buf, eol);
-- 2.22.0.rc1.424.g15834b9bb1