Fix for bug #24948.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2bc9a8ab06d6fecb5edde33dff393ca2c9c66cda..8ad1382d834c2d521df1b97c58e2377fc5789afb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-15  Micah Cowan  <micah@cowan.name>
+
+       * retr.c (fd_read_body): Make both args to progress_create
+       consistent, resulting in an accurate progress display. Fixes bug
+       #24948.
+
 2009-06-14  Micah Cowan  <micah@cowan.name>
 
        * Makefile.am (wget_SOURCES): css-tokens.h needs to ship with

diff --git a/src/retr.c b/src/retr.c
index 9627f9e31320f39ea4f58ad6b32b78b176089e2c..ffa84c38410ef8238ce752714b2c2fb683f23539 100644 (file)
--- a/src/retr.c
+++ b/src/retr.c
@@ -226,7 +226,8 @@ fd_read_body (int fd, FILE *out, wgint toread, wgint startpos,
       /* If we're skipping STARTPOS bytes, pass 0 as the INITIAL
          argument to progress_create because the indicator doesn't
          (yet) know about "skipping" data.  */
-      progress = progress_create (skip ? 0 : startpos, startpos + toread);
+      wgint start = skip ? 0 : startpos;
+      progress = progress_create (start, start + toread);
       progress_interactive = progress_interactive_p (progress);
     }