From 7c8bb5dfff48e47bd102d2b57b1e5eb1f332d903 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 16 Jan 2000 18:52:53 +0000 Subject: [PATCH] =?UTF-8?q?Made=20the=20progress=20bar=20cooler,=20with=20?= =?UTF-8?q?ideas=20from=20Bj=F6rn=20Stenberg=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/progress.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/progress.c b/lib/progress.c index 6a083370b..2e3f6e975 100644 --- a/lib/progress.c +++ b/lib/progress.c @@ -83,7 +83,8 @@ void ProgressInit(struct UrlData *data, int max) if ( data->progressmode == CURL_PROGRESS_STATS ) fprintf(data->err, - " %% Received Total Speed Time left Total Curr.Speed\n"); + " %% Received Total Speed Estimated Time Left Curr.Speed\n"); + } void time2str(char *r, int t) @@ -144,18 +145,21 @@ void ProgressShow(struct UrlData *data, return; if(-1 != progressmax) { - char left[20],estim[20]; + char left[20]; + char estim[20]; + char timespent[20]; int estimate = progressmax/(int) speed; time2str(left,estimate-(int) spent); time2str(estim,estimate); + time2str(timespent,spent); percen=(double)point/progressmax; percen=percen*100; - fprintf(data->err, "\r%3d %8d %8d %6.0lf %s %s %6.0lf ", + fprintf(stderr, "\r%3d %10d %10d %6.0lf %s %s %s %6.0lf ", (int)percen, point, progressmax, - speed, left, estim, data->current_speed); + speed, estim, timespent, left, data->current_speed); } else fprintf(data->err,