undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ar/progress'

Browse Source 
* ar/progress:
  Fix the progress code to output LF only when it is really needed
This commit is contained in:
Junio C Hamano 2007-05-23 11:39:58 -07:00
commit ed82edc402
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
progress.c
View File

@ -62,11 +62,13 @@ int display_progress(struct progress *progress, unsigned n)
fprintf(stderr, "%s%4u%% (%u/%u) done\r", fprintf(stderr, "%s%4u%% (%u/%u) done\r",
progress->prefix, percent, n, progress->total); progress->prefix, percent, n, progress->total);
progress_update = 0; progress_update = 0;
progress->need_lf = 1;
return 1; return 1;
} }
} else if (progress_update) { } else if (progress_update) {
fprintf(stderr, "%s%u\r", progress->prefix, n); fprintf(stderr, "%s%u\r", progress->prefix, n);
progress_update = 0; progress_update = 0;
progress->need_lf = 1;
return 1; return 1;
} }
return 0; return 0;
@ -80,6 +82,7 @@ void start_progress(struct progress *progress, const char *title,
progress->total = total; progress->total = total;
progress->last_percent = -1; progress->last_percent = -1;
progress->delay = 0; progress->delay = 0;
progress->need_lf = 0;
if (snprintf(buf, sizeof(buf), title, total)) if (snprintf(buf, sizeof(buf), title, total))
fprintf(stderr, "%s\n", buf); fprintf(stderr, "%s\n", buf);
set_progress_signal(); set_progress_signal();
@ -95,12 +98,13 @@ void start_progress_delay(struct progress *progress, const char *title,
progress->delayed_percent_treshold = percent_treshold; progress->delayed_percent_treshold = percent_treshold;
progress->delayed_title = title; progress->delayed_title = title;
progress->delay = delay; progress->delay = delay;
progress->need_lf = 0;
set_progress_signal(); set_progress_signal();
} }
void stop_progress(struct progress *progress) void stop_progress(struct progress *progress)
{ {
clear_progress_signal(); clear_progress_signal();
if (progress->total) if (progress->need_lf)
fputc('\n', stderr); fputc('\n', stderr);
} }

1
progress.h
View File

@ -8,6 +8,7 @@ struct progress {
unsigned delay; unsigned delay;
unsigned delayed_percent_treshold; unsigned delayed_percent_treshold;
const char *delayed_title; const char *delayed_title;
int need_lf;
}; };
int display_progress(struct progress *progress, unsigned n); int display_progress(struct progress *progress, unsigned n);