зеркало из https://github.com/microsoft/git.git
Fix the progress code to output LF only when it is really needed
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Родитель
7ca055f75a
Коммит
421f9d1685
|
@ -62,11 +62,13 @@ int display_progress(struct progress *progress, unsigned n)
|
|||
fprintf(stderr, "%s%4u%% (%u/%u) done\r",
|
||||
progress->prefix, percent, n, progress->total);
|
||||
progress_update = 0;
|
||||
progress->need_lf = 1;
|
||||
return 1;
|
||||
}
|
||||
} else if (progress_update) {
|
||||
fprintf(stderr, "%s%u\r", progress->prefix, n);
|
||||
progress_update = 0;
|
||||
progress->need_lf = 1;
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
@ -80,6 +82,7 @@ void start_progress(struct progress *progress, const char *title,
|
|||
progress->total = total;
|
||||
progress->last_percent = -1;
|
||||
progress->delay = 0;
|
||||
progress->need_lf = 0;
|
||||
if (snprintf(buf, sizeof(buf), title, total))
|
||||
fprintf(stderr, "%s\n", buf);
|
||||
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_title = title;
|
||||
progress->delay = delay;
|
||||
progress->need_lf = 0;
|
||||
set_progress_signal();
|
||||
}
|
||||
|
||||
void stop_progress(struct progress *progress)
|
||||
{
|
||||
clear_progress_signal();
|
||||
if (progress->total)
|
||||
if (progress->need_lf)
|
||||
fputc('\n', stderr);
|
||||
}
|
||||
|
|
|
@ -8,6 +8,7 @@ struct progress {
|
|||
unsigned delay;
|
||||
unsigned delayed_percent_treshold;
|
||||
const char *delayed_title;
|
||||
int need_lf;
|
||||
};
|
||||
|
||||
int display_progress(struct progress *progress, unsigned n);
|
||||
|
|
Загрузка…
Ссылка в новой задаче