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

wget: remove functions which retry on EINTR

Browse Source 
function                                             old     new   delta
retrieve_file_data                                   392     353     -39
safe_fgets                                            58       -     -58
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-97)             Total: -97 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-02-10 09:55:05 +01:00
parent e3ece7878b
commit 0fac2f7b5b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
networking/wget.c
View File

@ -128,6 +128,7 @@ static void strip_ipv6_scope_id(char *host)
overlapping_strcpy(scope, cp); overlapping_strcpy(scope, cp);
} }
#if 0 /* were needed when we used signal-driven progress bar */
/* Read NMEMB bytes into PTR from STREAM. Returns the number of bytes read, /* Read NMEMB bytes into PTR from STREAM. Returns the number of bytes read,
* and a short count if an eof or non-interrupt error is encountered. */ * and a short count if an eof or non-interrupt error is encountered. */
static size_t safe_fread(void *ptr, size_t nmemb, FILE *stream) static size_t safe_fread(void *ptr, size_t nmemb, FILE *stream)
@ -160,6 +161,7 @@ static char *safe_fgets(char *s, int size, FILE *stream)
return ret; return ret;
} }
#endif
#if ENABLE_FEATURE_WGET_AUTHENTICATION #if ENABLE_FEATURE_WGET_AUTHENTICATION
/* Base64-encode character string. */ /* Base64-encode character string. */
@ -495,7 +497,7 @@ static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)
progress_meter(PROGRESS_BUMP); progress_meter(PROGRESS_BUMP);
} }
#endif #endif
n = safe_fread(G.wget_buf, rdsz, dfp); n = fread(G.wget_buf, 1, rdsz, dfp);
if (n <= 0) { if (n <= 0) {
if (ferror(dfp)) { if (ferror(dfp)) {
/* perror will not work: ferror doesn't set errno */ /* perror will not work: ferror doesn't set errno */
@ -515,9 +517,9 @@ static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)
if (!G.chunked) if (!G.chunked)
break; break;
safe_fgets(G.wget_buf, sizeof(G.wget_buf), dfp); /* This is a newline */ fgets(G.wget_buf, sizeof(G.wget_buf), dfp); /* This is a newline */
get_clen: get_clen:
safe_fgets(G.wget_buf, sizeof(G.wget_buf), dfp); fgets(G.wget_buf, sizeof(G.wget_buf), dfp);
G.content_len = STRTOOFF(G.wget_buf, NULL, 16); G.content_len = STRTOOFF(G.wget_buf, NULL, 16);
/* FIXME: error check? */ /* FIXME: error check? */
if (G.content_len == 0) if (G.content_len == 0)