From 1edf3fa264c9455b7f6f8c2b55714bfa4558dbc1 Mon Sep 17 00:00:00 2001
From: Francois Fleuret <francois@fleuret.org>
Date: Mon, 29 Mar 2010 17:50:28 +0200
Subject: [PATCH] Bug fixed in the progress bar display.
---
finddup.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/finddup.c b/finddup.c
index 6b14142..acbbddc 100644
--- a/finddup.c
+++ b/finddup.c
@@ -403,8 +403,8 @@ void print_progress(struct progress_state *state) {
if(state->bar_width <= 0 || position != state->last_position) {
if(!ioctl (STDERR_FILENO, TIOCGWINSZ, (char *) &win)) {
/* Something weird is going on if the previous test is wrong */
- if(win.ws_col >= PROGRESS_BUFFER_SIZE) {
- state->bar_width = PROGRESS_BUFFER_SIZE - 8;
+ if(win.ws_col >= PROGRESS_BUFFER_SIZE - 3) {
+ state->bar_width = PROGRESS_BUFFER_SIZE - 10;
} else {
state->bar_width = win.ws_col - 7;
}
@@ -417,7 +417,9 @@ void print_progress(struct progress_state *state) {
for(; k < state->bar_width; k++) {
*(s++) = '-';
}
- sprintf(s, " [%3d%%]\r",
+
+ /* We need four % because of the fprintf that follows */
+ sprintf(s, " [%3d%%%%]\r",
(100 * state->value) / (state->nb_values - 1));
fprintf(stderr, buffer);
--
2.39.5