-void print_progress(int max, int n, int *pp) {
- int p, k;
- int width;
- if(show_progress && tty_width > 0) {
- width = tty_width - 7;
- p = (width * n) / (max - 1);
- if(p > *pp) {
- for(k = 0; k < p; k++) {
- fprintf(stderr, "+");
- }
- for(; k < width; k++) {
- fprintf(stderr, "-");
+struct progress_state {
+ int bar_width;
+ int nb_values, value;
+ int last_position;
+};
+
+void print_progress(struct progress_state *state) {
+ int position, k;
+ struct winsize win;
+ char buffer[PROGRESS_BUFFER_SIZE];
+ char *s;
+
+ if(show_progress) {
+ /* We use the previous bar_width to compute the position, so that
+ we avoid doing too many ioctls */
+ position = (state->bar_width * state->value) / (state->nb_values - 1);
+ 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 - 3) {
+ state->bar_width = PROGRESS_BUFFER_SIZE - 10;
+ } else {
+ state->bar_width = win.ws_col - 7;
+ }
+ position = (state->bar_width * state->value) / (state->nb_values - 1);
+ state->last_position = position;
+ s = buffer;
+ for(k = 0; k < position; k++) {
+ *(s++) = '+';
+ }
+ for(; k < state->bar_width; k++) {
+ *(s++) = '-';
+ }
+
+ /* We need four % because of the fprintf that follows */
+ sprintf(s, " [%3d%%%%]\r",
+ (100 * state->value) / (state->nb_values - 1));
+
+ fprintf(stderr, buffer);