emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"When the filesize is known from content-length header, safe_fread is

Browse Source 
always told to read sizeof(buf).  This waits until the underlying
fread() to time-out for the last part of the downloaded body.  Fix
this by sending the number of remaining bytes to read when known." -
junkio@
I reworked the logic in his patch
This commit is contained in:
Glenn L McGrath 2003-08-28 21:55:22 +00:00
parent 8b96b7169d
commit 83e4a5bccf
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
networking/wget.c
View File

@ -481,25 +481,30 @@ read_response: if (fgets(buf, sizeof(buf), sfp) == NULL)
progressmeter(-1); progressmeter(-1);
#endif #endif
do { do {
while ((filesize > 0 || !got_clen) && (n = safe_fread(buf, 1, chunked ? (filesize > sizeof(buf) ? sizeof(buf) : filesize) : sizeof(buf), dfp)) > 0) { while ((filesize > 0 || !got_clen) && (n = safe_fread(buf, 1, (chunked || !got_clen || (filesize > sizeof(buf)) ? sizeof(buf) : filesize), dfp)) > 0) {
if (safe_fwrite(buf, 1, n, output) != n) if (safe_fwrite(buf, 1, n, output) != n) {
bb_perror_msg_and_die("write error"); bb_perror_msg_and_die("write error");
}
#ifdef CONFIG_FEATURE_WGET_STATUSBAR #ifdef CONFIG_FEATURE_WGET_STATUSBAR
statbytes+=n; statbytes+=n;
#endif #endif
if (got_clen) if (got_clen) {
filesize -= n; filesize -= n;
} }
}
if (chunked) { if (chunked) {
safe_fgets(buf, sizeof(buf), dfp); /* This is a newline */ safe_fgets(buf, sizeof(buf), dfp); /* This is a newline */
safe_fgets(buf, sizeof(buf), dfp); safe_fgets(buf, sizeof(buf), dfp);
filesize = strtol(buf, (char **) NULL, 16); filesize = strtol(buf, (char **) NULL, 16);
if (filesize==0) chunked = 0; /* all done! */ if (filesize==0) {
chunked = 0; /* all done! */
}
} }
if (n == 0 && ferror(dfp)) if (n == 0 && ferror(dfp)) {
bb_perror_msg_and_die("network read error"); bb_perror_msg_and_die("network read error");
}
} while (chunked); } while (chunked);
#ifdef CONFIG_FEATURE_WGET_STATUSBAR #ifdef CONFIG_FEATURE_WGET_STATUSBAR
if (quiet_flag==FALSE) if (quiet_flag==FALSE)
@ -811,7 +816,7 @@ progressmeter(int flag)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: wget.c,v 1.54 2003/07/22 08:56:51 andersen Exp $ * $Id: wget.c,v 1.55 2003/08/28 21:55:22 bug1 Exp $
*/ */
@ -823,6 +828,3 @@ c-basic-offset: 4
tab-width: 4 tab-width: 4
End: End:
*/ */