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

wget: fix download of URLs like:

Browse Source 
http://busybox.net?var=a/b
http://busybox.net?login=john@doe
http://busybox.net#test/test
This commit is contained in:
Denis Vlasenko 2006-10-07 14:28:28 +00:00
parent bede7d0ebe
commit a655152b00
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
networking/wget.c
View File

@ -351,6 +351,7 @@ read_response:
} }
if (strcasecmp(buf, "location") == 0) { if (strcasecmp(buf, "location") == 0) {
if (s[0] == '/') if (s[0] == '/')
// FIXME: this is dirty
target.path = xstrdup(s+1); target.path = xstrdup(s+1);
else { else {
parse_url(xstrdup(s), &target); parse_url(xstrdup(s), &target);
@ -500,25 +501,48 @@ read_response:
static void parse_url(char *url, struct host_info *h) static void parse_url(char *url, struct host_info *h)
{ {
char *cp, *sp, *up, *pp; char *p, *cp, *sp, *up, *pp;
if (strncmp(url, "http://", 7) == 0) { if (strncmp(url, "http://", 7) == 0) {
h->port = bb_lookup_port("http", "tcp", 80); h->port = bb_lookup_port("http", "tcp", 80);
h->host = url + 7; h->host = url + 7;
h->is_ftp = 0; h->is_ftp = 0;
} else if (strncmp(url, "ftp://", 6) == 0) { } else if (strncmp(url, "ftp://", 6) == 0) {
h->port = bb_lookup_port("ftp", "tfp", 21); h->port = bb_lookup_port("ftp", "tcp", 21);
h->host = url + 6; h->host = url + 6;
h->is_ftp = 1; h->is_ftp = 1;
} else } else
bb_error_msg_and_die("not an http or ftp url: %s", url); bb_error_msg_and_die("not an http or ftp url: %s", url);
// FYI:
// "Real" wget 'http://busybox.net?var=a/b' sends this request:
// 'GET /?var=a/b HTTP 1.0'
// and saves 'index.html?var=a%2Fb'
// wget 'http://busybox.net?login=john@doe':
// request: 'GET /?login=john@doe HTTP/1.0'
// saves: 'index.html?login=john@doe' (we save ?login=john@doe)
// wget 'http://busybox.net#test/test':
// request: 'GET / HTTP/1.0'
// saves: 'index.html' (we save 'test')
//
// We also don't add unique .N suffix if file exists...
sp = strchr(h->host, '/'); sp = strchr(h->host, '/');
if (sp) { p = strchr(h->host, '?'); if (!sp || (p && sp > p)) sp = p;
p = strchr(h->host, '#'); if (!sp || (p && sp > p)) sp = p;
if (!sp) {
h->path = "";
} else if (*sp == '/') {
*sp++ = '\0'; *sp++ = '\0';
h->path = sp; h->path = sp;
} else } else { // '#' or '?'
h->path = xstrdup(""); // http://busybox.net?login=john@doe is a valid URL
// memmove converts to:
// http:/busybox.nett?login=john@doe...
memmove(h->host-1, h->host, sp - h->host);
h->host--;
sp[-1] = '\0';
h->path = sp;
}
up = strrchr(h->host, '@'); up = strrchr(h->host, '@');
if (up != NULL) { if (up != NULL) {