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

wget: try reading after poll timeout - stdio may have buffered data. Closes 5426

Browse Source 
function                                             old     new   delta
retrieve_file_data                                   436     451     +15

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2012-08-16 16:52:27 +02:00
parent 45c35e9de0
commit 9c55143bbf
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
networking/wget.c
View File

@ -448,6 +448,9 @@ static void NOINLINE retrieve_file_data(FILE *dfp)
# endif # endif
struct pollfd polldata; struct pollfd polldata;
# if ENABLE_FEATURE_WGET_TIMEOUT
second_cnt = G.timeout_seconds;
# endif
polldata.fd = fileno(dfp); polldata.fd = fileno(dfp);
polldata.events = POLLIN | POLLPRI; polldata.events = POLLIN | POLLPRI;
#endif #endif
@ -483,12 +486,7 @@ static void NOINLINE retrieve_file_data(FILE *dfp)
} }
#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT #if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
# if ENABLE_FEATURE_WGET_TIMEOUT if (safe_poll(&polldata, 1, 1000) == 0) {
second_cnt = G.timeout_seconds;
# endif
while (1) {
if (safe_poll(&polldata, 1, 1000) != 0)
break; /* error, EOF, or data is available */
# if ENABLE_FEATURE_WGET_TIMEOUT # if ENABLE_FEATURE_WGET_TIMEOUT
if (second_cnt != 0 && --second_cnt == 0) { if (second_cnt != 0 && --second_cnt == 0) {
progress_meter(PROGRESS_END); progress_meter(PROGRESS_END);
@ -497,6 +495,13 @@ static void NOINLINE retrieve_file_data(FILE *dfp)
# endif # endif
/* Needed for "stalled" indicator */ /* Needed for "stalled" indicator */
progress_meter(PROGRESS_BUMP); progress_meter(PROGRESS_BUMP);
/*
* We used to loop back to poll here,
* but in chunked case, we can be here after
* fgets and it could buffer some data in dfp...
* which poll knows nothing about!
* Therefore let's try fread'ing anyway.
*/
} }
/* fread internally uses read loop, which in our case /* fread internally uses read loop, which in our case
@ -527,7 +532,9 @@ static void NOINLINE retrieve_file_data(FILE *dfp)
} }
xwrite(G.output_fd, G.wget_buf, n); xwrite(G.output_fd, G.wget_buf, n);
#if ENABLE_FEATURE_WGET_TIMEOUT
second_cnt = G.timeout_seconds;
#endif
#if ENABLE_FEATURE_WGET_STATUSBAR #if ENABLE_FEATURE_WGET_STATUSBAR
G.transferred += n; G.transferred += n;
progress_meter(PROGRESS_BUMP); progress_meter(PROGRESS_BUMP);