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

wget: -100 bytes, reduce stack usage, remove --header length limit

Browse Source
This commit is contained in:
Denis Vlasenko 2006-10-23 23:21:58 +00:00
parent 703aa13ff5
commit 7534e0834f
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
networking/wget.c
View File

@ -111,15 +111,14 @@ static const struct option wget_long_options[] = {
int wget_main(int argc, char **argv) int wget_main(int argc, char **argv)
{ {
int n, try=5, status; int n, status;
unsigned opt; int try = 5;
int port; int port;
unsigned opt;
char *proxy = 0; char *proxy = 0;
char *dir_prefix=NULL; char *dir_prefix = NULL;
char *s, buf[512]; char *s, buf[512];
char extra_headers[1024]; char *extra_headers = NULL;
char *extra_headers_ptr = extra_headers;
int extra_headers_left = sizeof(extra_headers);
struct host_info server, target; struct host_info server, target;
struct sockaddr_in s_in; struct sockaddr_in s_in;
llist_t *headers_llist = NULL; llist_t *headers_llist = NULL;
@ -149,18 +148,17 @@ int wget_main(int argc, char **argv)
/* Use the proxy if necessary. */ /* Use the proxy if necessary. */
use_proxy = 0; use_proxy = 0;
} }
if (opt & WGET_OPT_HEADER) { if (headers_llist) {
int size = 1;
char *cp;
llist_t *ll = headers_llist;
while (ll) {
size += strlen(ll->data) + 2;
ll = ll->link;
}
extra_headers = cp = xmalloc(size);
while (headers_llist) { while (headers_llist) {
int arglen = strlen(headers_llist->data); cp += sprintf(cp, "%s\r\n", headers_llist->data);
if (extra_headers_left - arglen - 2 <= 0)
bb_error_msg_and_die("extra_headers buffer too small "
"(need %i)", extra_headers_left - arglen);
strcpy(extra_headers_ptr, headers_llist->data);
extra_headers_ptr += arglen;
extra_headers_left -= ( arglen + 2 );
*extra_headers_ptr++ = '\r';
*extra_headers_ptr++ = '\n';
*(extra_headers_ptr + 1) = 0;
headers_llist = headers_llist->link; headers_llist = headers_llist->link;
} }
} }
@ -283,9 +281,9 @@ int wget_main(int argc, char **argv)
if (beg_range) if (beg_range)
fprintf(sfp, "Range: bytes="OFF_FMT"-\r\n", beg_range); fprintf(sfp, "Range: bytes="OFF_FMT"-\r\n", beg_range);
if(extra_headers_left < sizeof(extra_headers)) if (extra_headers)
fputs(extra_headers,sfp); fputs(extra_headers, sfp);
fprintf(sfp,"Connection: close\r\n\r\n"); fprintf(sfp, "Connection: close\r\n\r\n");
/* /*
* Retrieve HTTP response line and check for "200" status code. * Retrieve HTTP response line and check for "200" status code.