wget: handle URLs with @ or hash differently

If server replied with 302 and

Location: ?foo

we used to underflow the allocated space while trying to form the "@foo"
filename. Switch to forming "foo" filename.

function                                             old     new   delta
packed_usage                                       32795   32799      +4
parse_url                                            387     352     -35
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 4/-35)             Total: -31 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/networking/wget.c b/networking/wget.c
index b6c76e9dc4e8f41ac7ad8bc8c1027c7d96f6cfdf..30c3392441885106d615ff99372f03116a5bb3a8 100644 (file)
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -539,7 +539,7 @@ static void parse_url(const char *src_url, struct host_info *h)
        //   and saves 'index.html?var=a%2Fb' (we save 'b')
        // 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')
+       //   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')
@@ -553,13 +553,13 @@ static void parse_url(const char *src_url, struct host_info *h)
        } else if (*sp == '/') {
                *sp = '\0';
                h->path = sp + 1;
-       } else { // '#' or '?'
+       } else {
+               // sp points to '#' or '?'
+               // Note:
                // 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';
+               // (without '/' between ".net" and "?"),
+               // can't store NUL at sp[-1] - this destroys hostname.
+               *sp++ = '\0';
                h->path = sp;
        }