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

diff --git a/lib/progress.c b/lib/progress.c
index e0758f2a83b653380fa63e4155b01e5e7db3440c..49047f1a67a35fb50ab6e44580d2618b77a90af6 100644 (file)
--- 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 c33cf13fd354079d04b0f51daa88a1edad7a9805..8d2c61770c23a1fcfc4eab9eae750633dc3de097 100644 (file)
--- 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;
 }