From 34ef39015e3064ca61f48428911ed6ce89738875 Mon Sep 17 00:00:00 2001 From: Julien Chaffraix Date: Sun, 20 Mar 2011 18:00:29 -0700 Subject: progress: don't print the last update on a separate line. Curl_posttransfer is called too soon to add the final new line. Moved the new line logic to pgrsDone as there is no more call to update the progress status after this call. Reported by: Dmitri Shubin http://curl.haxx.se/mail/lib-2010-12/0162.html --- lib/progress.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/progress.c') diff --git a/lib/progress.c b/lib/progress.c index e0758f2a8..49047f1a6 100644 --- a/lib/progress.c +++ b/lib/progress.c @@ -137,6 +137,12 @@ void Curl_pgrsDone(struct connectdata *conn) data->progress.lastshow=0; Curl_pgrsUpdate(conn); /* the final (forced) update */ + if(!(data->progress.flags & PGRS_HIDE) && + !data->progress.callback) + /* only output if we don't use a progress callback and we're not + * hidden */ + fprintf(data->set.err, "\n"); + data->progress.speeder_c = 0; /* reset the progress meter display */ } -- cgit v1.2.1