From: Micah Cowan <micah@cowan.name>
Date: Tue, 16 Jun 2009 06:33:41 +0000 (-0700)
Subject: Fix for bug #24948.
X-Git-Tag: v1.13~341
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=4bbcfc2a1d05c1ad0496c2f8f9e56236e4c76c00;hp=259c56016608e599a69b7083530de012349eecf3

Fix for bug #24948.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 2bc9a8ab..8ad1382d 100644
--- 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 9627f9e3..ffa84c38 100644
--- 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);
     }