diff options
| author | Julien Chaffraix <julien.chaffraix@gmail.com> | 2011-03-20 18:00:29 -0700 |
|---|---|---|
| committer | Julien Chaffraix <julien.chaffraix@gmail.com> | 2011-03-21 21:00:56 -0700 |
| commit | 34ef39015e3064ca61f48428911ed6ce89738875 (patch) | |
| tree | 9aec18bb3d2cafe3c63d554d2cc3da864d75f53e | |
| parent | 252d70a1ed5e3ce3eea37952c89ba9fe75a7095c (diff) | |
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 <sbn_at_tbricks.com>
http://curl.haxx.se/mail/lib-2010-12/0162.html
| -rw-r--r-- | lib/progress.c | 6 | ||||
| -rw-r--r-- | lib/transfer.c | 5 |
2 files changed, 6 insertions, 5 deletions
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 */ } diff --git a/lib/transfer.c b/lib/transfer.c index c33cf13fd..8d2c61770 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -1528,11 +1528,6 @@ CURLcode Curl_posttransfer(struct SessionHandle *data) (void)data; /* unused parameter */ #endif - 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"); - return CURLE_OK; } |