accidentally applied wrong (old) patch, fixing up...
[oweals/busybox.git] / networking / wget.c
index b1cc35e34b28b4ffbc9c5fe7fcff92430d74a98f..5c3083c25d70791d239be525b4f2ddc58ca3108f 100644 (file)
@@ -6,32 +6,16 @@
  *
  */
 
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#include <getopt.h>
+/* We want libc to give us xxx64 functions also */
+/* http://www.unix.org/version2/whatsnew/lfs20mar.html */
+#define _LARGEFILE64_SOURCE 1
 
 #include "busybox.h"
+#include <getopt.h>    /* for struct option */
 
 struct host_info {
+       // May be used if we ever will want to free() all xstrdup()s...
+       /* char *allocated; */
        char *host;
        int port;
        char *path;
@@ -40,29 +24,27 @@ struct host_info {
 };
 
 static void parse_url(char *url, struct host_info *h);
-static FILE *open_socket(char *host, int port);
+static FILE *open_socket(len_and_sockaddr *lsa);
 static char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc);
 static int ftpcmd(char *s1, char *s2, FILE *fp, char *buf);
 
 /* Globals (can be accessed from signal handlers */
-static off_t filesize = 0;             /* content-length of the file */
-static int chunked = 0;                        /* chunked transfer encoding */
-#ifdef CONFIG_FEATURE_WGET_STATUSBAR
+static off_t content_len;        /* Content-length of the file */
+static off_t beg_range;          /* Range at which continue begins */
+#if ENABLE_FEATURE_WGET_STATUSBAR
+static off_t transferred;        /* Number of bytes transferred so far */
+#endif
+static int chunked;                     /* chunked transfer encoding */
+#if ENABLE_FEATURE_WGET_STATUSBAR
 static void progressmeter(int flag);
-static char *curfile;                  /* Name of current file being transferred. */
-static struct timeval start;   /* Time a transfer started. */
-static volatile unsigned long statbytes = 0; /* Number of bytes transferred so far. */
-/* For progressmeter() -- number of seconds before xfer considered "stalled" */
-static const int STALLTIME = 5;
+static char *curfile;                   /* Name of current file being transferred */
+static struct timeval start;            /* Time a transfer started */
+enum {
+       STALLTIME = 5                   /* Seconds when xfer considered "stalled" */
+};
+#else
+static void progressmeter(int flag) {}
 #endif
-               
-static void close_and_delete_outfile(FILE* output, char *fname_out, int do_continue)
-{
-       if (output != stdout && do_continue==0) {
-               fclose(output);
-               unlink(fname_out);
-       }
-}
 
 /* Read NMEMB elements of SIZE bytes into PTR from STREAM.  Returns the
  * number of elements read, and a short count if an eof or non-interrupt
@@ -79,21 +61,6 @@ static size_t safe_fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
        return ret;
 }
 
-/* Write NMEMB elements of SIZE bytes from PTR to STREAM.  Returns the
- * number of elements written, and a short count if an eof or non-interrupt
- * error is encountered.  */
-static size_t safe_fwrite(void *ptr, size_t size, size_t nmemb, FILE *stream)
-{
-       size_t ret = 0;
-
-       do {
-               clearerr(stream);
-               ret += fwrite((char *)ptr + (ret * size), size, nmemb - ret, stream);
-       } while (ret < nmemb && ferror(stream) && errno == EINTR);
-
-       return ret;
-}
-
 /* Read a line or SIZE - 1 bytes into S, whichever is less, from STREAM.
  * Returns S, or NULL if an eof or non-interrupt error is encountered.  */
 static char *safe_fgets(char *s, int size, FILE *stream)
@@ -108,127 +75,99 @@ static char *safe_fgets(char *s, int size, FILE *stream)
        return ret;
 }
 
-#define close_delete_and_die(s...) { \
-       close_and_delete_outfile(output, fname_out, do_continue); \
-       bb_error_msg_and_die(s); }
-
-
-#ifdef CONFIG_FEATURE_WGET_AUTHENTICATION
+#if ENABLE_FEATURE_WGET_AUTHENTICATION
 /*
- *  Base64-encode character string
- *  oops... isn't something similar in uuencode.c?
- *  It would be better to use already existing code
+ *  Base64-encode character string and return the string.
  */
-char *base64enc(char *p, char *buf, int len) {
-
-        char al[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-                    "0123456789+/";
-               char *s = buf;
-
-        while(*p) {
-                               if (s >= buf+len-4)
-                                       bb_error_msg_and_die("buffer overflow");
-                *(s++) = al[(*p >> 2) & 0x3F];
-                *(s++) = al[((*p << 4) & 0x30) | ((*(p+1) >> 4) & 0x0F)];
-                *s = *(s+1) = '=';
-                *(s+2) = 0;
-                if (! *(++p)) break;
-                *(s++) = al[((*p << 2) & 0x3C) | ((*(p+1) >> 6) & 0x03)];
-                if (! *(++p)) break;
-                *(s++) = al[*(p++) & 0x3F];
-        }
-
-               return buf;
+static char *base64enc(unsigned char *p, char *buf, int len)
+{
+       bb_uuencode(p, buf, len, bb_uuenc_tbl_base64);
+       return buf;
 }
 #endif
 
 int wget_main(int argc, char **argv)
 {
-       int n, try=5, status;
+       char buf[512];
+       struct host_info server, target;
+       len_and_sockaddr *lsa;
+       int n, status;
        int port;
+       int try = 5;
+       unsigned opt;
+       char *s;
        char *proxy = 0;
-       char *dir_prefix=NULL;
-       char *s, buf[512];
-       struct stat sbuf;
-       char extra_headers[1024];
-       char *extra_headers_ptr = extra_headers;
-       int extra_headers_left = sizeof(extra_headers);
-       int which_long_opt = 0, option_index = -1;
-       struct host_info server, target;
+       char *dir_prefix = NULL;
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+       char *extra_headers = NULL;
+       llist_t *headers_llist = NULL;
+#endif
+
+       /* server.allocated = target.allocated = NULL; */
+
+       FILE *sfp = NULL;               /* socket to web/ftp server         */
+       FILE *dfp = NULL;               /* socket to ftp server (data)      */
+       char *fname_out = NULL;         /* where to direct output (-O)      */
+       int got_clen = 0;               /* got content-length: from server  */
+       int output_fd = -1;
+       int use_proxy = 1;              /* Use proxies if env vars are set  */
+       const char *proxy_flag = "on";  /* Use proxies if env vars are set  */
+       const char *user_agent = "Wget";/* Content of the "User-Agent" header field */
 
-       FILE *sfp = NULL;                       /* socket to web/ftp server                     */
-       FILE *dfp = NULL;                       /* socket to ftp server (data)          */
-       char *fname_out = NULL;         /* where to direct output (-O)          */
-       int do_continue = 0;            /* continue a prev transfer (-c)        */
-       long beg_range = 0L;            /*   range at which continue begins     */
-       int got_clen = 0;                       /* got content-length: from server      */
-       FILE *output;                           /* socket to web server                         */
-       int quiet_flag = FALSE;         /* Be verry, verry quiet...                     */
-       int noproxy = 0;            /* Use proxies if env vars are set  */
-
-#define LONG_HEADER    1
-#define LONG_PASSIVE   2
-
-       struct option long_options[] = {
-               { "continue",        0, NULL, 'c' },
-               { "quiet",           0, NULL, 'q' },
-               { "output-document", 1, NULL, 'O' },
-               { "header",              1, &which_long_opt, LONG_HEADER },
-               { "proxy",           1, NULL, 'Y' },
-               { "passive-ftp",     0, &which_long_opt, LONG_PASSIVE },
-               { 0,                 0, 0, 0 }
-       };
        /*
         * Crack command line.
         */
-       while ((n = getopt_long(argc, argv, "cqO:P:Y:", long_options, &option_index)) != EOF) {
-               switch (n) {
-               case 'c':
-                       ++do_continue;
-                       break;
-               case 'P':
-                       dir_prefix = optarg;
-                       break;
-               case 'q':
-                       quiet_flag = TRUE;
-                       break;
-               case 'O':
-                       /* can't set fname_out to NULL if outputting to stdout, because
-                        * this gets interpreted as the auto-gen output filename
-                        * case below  - tausq@debian.org
-                        */
-                       fname_out = optarg;
-                       break;
-               case 'Y':
-                       if (strcmp(optarg, "off") == 0)
-                               noproxy=1;      
-                       break;
-               case 0:
-                       switch (which_long_opt) {
-                               case LONG_HEADER: {
-                                       int arglen = strlen(optarg);
-                                       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, optarg);
-                                       extra_headers_ptr += arglen;
-                                       extra_headers_left -= ( arglen + 2 );
-                                       *extra_headers_ptr++ = '\r';
-                                       *extra_headers_ptr++ = '\n';
-                                       *(extra_headers_ptr + 1) = 0;
-                                       break;
-                               }
-                               case LONG_PASSIVE:
-                                       // ignore -- we always use passive mode
-                                       break;
-                       }
-                       break;
-               default:
-                       bb_show_usage();
+       enum {
+               WGET_OPT_CONTINUE   = 0x1,
+               WGET_OPT_QUIET      = 0x2,
+               WGET_OPT_OUTNAME    = 0x4,
+               WGET_OPT_PREFIX     = 0x8,
+               WGET_OPT_PROXY      = 0x10,
+               WGET_OPT_USER_AGENT = 0x20,
+               WGET_OPT_PASSIVE    = 0x40,
+               WGET_OPT_HEADER     = 0x80,
+       };
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+       static const struct option wget_long_options[] = {
+               // name, has_arg, flag, val
+               { "continue",         no_argument, NULL, 'c' },
+               { "quiet",            no_argument, NULL, 'q' },
+               { "output-document",  required_argument, NULL, 'O' },
+               { "directory-prefix", required_argument, NULL, 'P' },
+               { "proxy",            required_argument, NULL, 'Y' },
+               { "user-agent",       required_argument, NULL, 'U' },
+               { "passive-ftp",      no_argument, NULL, 0xff },
+               { "header",           required_argument, NULL, 0xfe },
+               { 0, 0, 0, 0 }
+       };
+       applet_long_options = wget_long_options;
+#endif
+       opt_complementary = "-1" USE_FEATURE_WGET_LONG_OPTIONS(":\xfe::");
+       opt = getopt32(argc, argv, "cqO:P:Y:U:",
+                               &fname_out, &dir_prefix,
+                               &proxy_flag, &user_agent
+                               USE_FEATURE_WGET_LONG_OPTIONS(, &headers_llist)
+                               );
+       if (strcmp(proxy_flag, "off") == 0) {
+               /* Use the proxy if necessary. */
+               use_proxy = 0;
+       }
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+       if (headers_llist) {
+               int size = 1;
+               char *cp;
+               llist_t *ll = headers_llist = rev_llist(headers_llist);
+               while (ll) {
+                       size += strlen(ll->data) + 2;
+                       ll = ll->link;
+               }
+               extra_headers = cp = xmalloc(size);
+               while (headers_llist) {
+                       cp += sprintf(cp, "%s\r\n", headers_llist->data);
+                       headers_llist = headers_llist->link;
                }
        }
-
-       if (argc - optind != 1)
-                       bb_show_usage();
+#endif
 
        parse_url(argv[optind], &target);
        server.host = target.host;
@@ -237,243 +176,265 @@ int wget_main(int argc, char **argv)
        /*
         * Use the proxy if necessary.
         */
-       if (!noproxy) {
+       if (use_proxy) {
                proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
-               if (proxy)
-                       parse_url(bb_xstrdup(proxy), &server);
+               if (proxy && *proxy) {
+                       parse_url(proxy, &server);
+               } else {
+                       use_proxy = 0;
+               }
        }
-       
+
        /* Guess an output filename */
        if (!fname_out) {
-               fname_out = 
-#ifdef CONFIG_FEATURE_WGET_STATUSBAR
-                       curfile = 
+               // Dirty hack. Needed because bb_get_last_path_component
+               // will destroy trailing / by storing '\0' in last byte!
+               if (!last_char_is(target.path, '/')) {
+                       fname_out =
+#if ENABLE_FEATURE_WGET_STATUSBAR
+                               curfile =
 #endif
-                       bb_get_last_path_component(target.path);
-               if (fname_out==NULL || strlen(fname_out)<1) {
-                       fname_out = 
-#ifdef CONFIG_FEATURE_WGET_STATUSBAR
-                               curfile = 
+                               bb_get_last_path_component(target.path);
+               }
+               if (!fname_out || !fname_out[0]) {
+                       fname_out =
+#if ENABLE_FEATURE_WGET_STATUSBAR
+                               curfile =
 #endif
                                "index.html";
                }
                if (dir_prefix != NULL)
                        fname_out = concat_path_file(dir_prefix, fname_out);
-#ifdef CONFIG_FEATURE_WGET_STATUSBAR
+#if ENABLE_FEATURE_WGET_STATUSBAR
        } else {
                curfile = bb_get_last_path_component(fname_out);
 #endif
        }
-       if (do_continue && !fname_out)
-               bb_error_msg_and_die("cannot specify continue (-c) without a filename (-O)");
-
+       /* Impossible?
+       if ((opt & WGET_OPT_CONTINUE) && !fname_out)
+               bb_error_msg_and_die("cannot specify continue (-c) without a filename (-O)"); */
 
        /*
-        * Open the output file stream.
+        * Determine where to start transfer.
         */
-       if (strcmp(fname_out, "-") == 0) {
-               output = stdout;
-               quiet_flag = TRUE;
-       } else {
-               output = bb_xfopen(fname_out, (do_continue ? "a" : "w"));
+       if (LONE_DASH(fname_out)) {
+               output_fd = 1;
+               opt &= ~WGET_OPT_CONTINUE;
+       }
+       if (opt & WGET_OPT_CONTINUE) {
+               output_fd = open(fname_out, O_WRONLY);
+               if (output_fd >= 0) {
+                       beg_range = xlseek(output_fd, 0, SEEK_END);
+               }
+               /* File doesn't exist. We do not create file here yet.
+                  We are not sure it exists on remove side */
        }
 
-       /*
-        * Determine where to start transfer.
-        */
-       if (do_continue) {
-               if (fstat(fileno(output), &sbuf) < 0)
-                       bb_perror_msg_and_die("fstat()");
-               if (sbuf.st_size > 0)
-                       beg_range = sbuf.st_size;
-               else
-                       do_continue = 0;
+       /* We want to do exactly _one_ DNS lookup, since some
+        * sites (i.e. ftp.us.debian.org) use round-robin DNS
+        * and we want to connect to only one IP... */
+       lsa = host2sockaddr(server.host, server.port);
+       if (!(opt & WGET_OPT_QUIET)) {
+               fprintf(stderr, "Connecting to %s (%s)\n", server.host,
+                               xmalloc_sockaddr2dotted(&lsa->sa, lsa->len));
+               /* We leak result of xmalloc_sockaddr2dotted */
        }
 
-       if (proxy || !target.is_ftp) {
+       if (use_proxy || !target.is_ftp) {
                /*
                 *  HTTP session
                 */
                do {
                        got_clen = chunked = 0;
 
-                       if (! --try)
-                               close_delete_and_die("too many redirections");
+                       if (!--try)
+                               bb_error_msg_and_die("too many redirections");
 
                        /*
                         * Open socket to http server
                         */
                        if (sfp) fclose(sfp);
-                       sfp = open_socket(server.host, server.port);
-                       
+                       sfp = open_socket(lsa);
+
                        /*
                         * Send HTTP request.
                         */
-                       if (proxy) {
-                               const char *format = "GET %stp://%s:%d/%s HTTP/1.1\r\n";
-#ifdef CONFIG_FEATURE_WGET_IP6_LITERAL
-                               if (strchr (target.host, ':'))
-                                       format = "GET %stp://[%s]:%d/%s HTTP/1.1\r\n";
-#endif
-                               fprintf(sfp, format,
+                       if (use_proxy) {
+                               fprintf(sfp, "GET %stp://%s/%s HTTP/1.1\r\n",
                                        target.is_ftp ? "f" : "ht", target.host,
-                                       target.port, target.path);
+                                       target.path);
                        } else {
                                fprintf(sfp, "GET /%s HTTP/1.1\r\n", target.path);
                        }
 
-                       fprintf(sfp, "Host: %s\r\nUser-Agent: Wget\r\n", target.host);
+                       fprintf(sfp, "Host: %s\r\nUser-Agent: %s\r\n",
+                               target.host, user_agent);
 
-#ifdef CONFIG_FEATURE_WGET_AUTHENTICATION
+#if ENABLE_FEATURE_WGET_AUTHENTICATION
                        if (target.user) {
                                fprintf(sfp, "Authorization: Basic %s\r\n",
-                                       base64enc(target.user, buf, sizeof(buf)));
+                                       base64enc((unsigned char*)target.user, buf, sizeof(buf)));
                        }
-                       if (proxy && server.user) {
+                       if (use_proxy && server.user) {
                                fprintf(sfp, "Proxy-Authorization: Basic %s\r\n",
-                                       base64enc(server.user, buf, sizeof(buf)));
+                                       base64enc((unsigned char*)server.user, buf, sizeof(buf)));
                        }
 #endif
 
-                       if (do_continue)
-                               fprintf(sfp, "Range: bytes=%ld-\r\n", beg_range);
-                       if(extra_headers_left < sizeof(extra_headers))
-                               fputs(extra_headers,sfp);
-                       fprintf(sfp,"Connection: close\r\n\r\n");
+                       if (beg_range)
+                               fprintf(sfp, "Range: bytes=%"OFF_FMT"d-\r\n", beg_range);
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+                       if (extra_headers)
+                               fputs(extra_headers, sfp);
+#endif
+                       fprintf(sfp, "Connection: close\r\n\r\n");
 
                        /*
-                       * Retrieve HTTP response line and check for "200" status code.
-                       */
-read_response:
+                       * Retrieve HTTP response line and check for "200" status code.
+                       */
+ read_response:
                        if (fgets(buf, sizeof(buf), sfp) == NULL)
-                               close_delete_and_die("no response from server");
-                               
-                       for (s = buf ; *s != '\0' && !isspace(*s) ; ++s)
-                       ;
-                       for ( ; isspace(*s) ; ++s)
-                       ;
-                       switch (status = atoi(s)) {
-                               case 0:
-                               case 100:
-                                       while (gethdr(buf, sizeof(buf), sfp, &n) != NULL);
-                                       goto read_response;
-                               case 200:
-                                       if (do_continue && output != stdout)
-                                               output = freopen(fname_out, "w", output);
-                                       do_continue = 0;
-                                       break;
-                               case 300:       /* redirection */
-                               case 301:
-                               case 302:
-                               case 303:
+                               bb_error_msg_and_die("no response from server");
+
+                       s = buf;
+                       while (*s != '\0' && !isspace(*s)) ++s;
+                       s = skip_whitespace(s);
+                       // FIXME: no error check
+                       // xatou wouldn't work: "200 OK"
+                       status = atoi(s);
+                       switch (status) {
+                       case 0:
+                       case 100:
+                               while (gethdr(buf, sizeof(buf), sfp, &n) != NULL)
+                                       /* eat all remaining headers */;
+                               goto read_response;
+                       case 200:
+                               break;
+                       case 300:       /* redirection */
+                       case 301:
+                       case 302:
+                       case 303:
+                               break;
+                       case 206:
+                               if (beg_range)
                                        break;
-                               case 206:
-                                       if (do_continue)
-                                               break;
-                                       /*FALLTHRU*/
-                               default:
-                                       chomp(buf);
-                                       close_delete_and_die("server returned error %d: %s", atoi(s), buf);
+                               /*FALLTHRU*/
+                       default:
+                               /* Show first line only and kill any ESC tricks */
+                               buf[strcspn(buf, "\n\r\x1b")] = '\0';
+                               bb_error_msg_and_die("server returned error: %s", buf);
                        }
-               
+
                        /*
                         * Retrieve HTTP headers.
                         */
                        while ((s = gethdr(buf, sizeof(buf), sfp, &n)) != NULL) {
                                if (strcasecmp(buf, "content-length") == 0) {
-                                       filesize = atol(s);
+                                       content_len = BB_STRTOOFF(s, NULL, 10);
+                                       if (errno || content_len < 0) {
+                                               bb_error_msg_and_die("content-length %s is garbage", s);
+                                       }
                                        got_clen = 1;
                                        continue;
                                }
                                if (strcasecmp(buf, "transfer-encoding") == 0) {
-                                       if (strcasecmp(s, "chunked") == 0) {
-                                               chunked = got_clen = 1;
-                                       } else {
-                                       close_delete_and_die("server wants to do %s transfer encoding", s);
-                                       }
+                                       if (strcasecmp(s, "chunked") != 0)
+                                               bb_error_msg_and_die("server wants to do %s transfer encoding", s);
+                                       chunked = got_clen = 1;
                                }
                                if (strcasecmp(buf, "location") == 0) {
                                        if (s[0] == '/')
-                                               target.path = bb_xstrdup(s+1);
+                                               /* free(target.allocated); */
+                                               target.path = /* target.allocated = */ xstrdup(s+1);
                                        else {
-                                               parse_url(bb_xstrdup(s), &target);
-                                               if (!proxy) {
+                                               parse_url(s, &target);
+                                               if (use_proxy == 0) {
                                                        server.host = target.host;
                                                        server.port = target.port;
                                                }
+                                               free(lsa);
+                                               lsa = host2sockaddr(server.host, server.port);
+                                               break;
                                        }
                                }
                        }
-               } while(status >= 300);
-               
+               } while (status >= 300);
+
                dfp = sfp;
-       }
-       else
-       {
+
+       } else {
+
                /*
                 *  FTP session
                 */
-               if (! target.user)
-                       target.user = bb_xstrdup("anonymous:busybox@");
+               if (!target.user)
+                       target.user = xstrdup("anonymous:busybox@");
 
-               sfp = open_socket(server.host, server.port);
+               sfp = open_socket(lsa);
                if (ftpcmd(NULL, NULL, sfp, buf) != 220)
-                       close_delete_and_die("%s", buf+4);
+                       bb_error_msg_and_die("%s", buf+4);
 
-               /* 
+               /*
                 * Splitting username:password pair,
                 * trying to log in
                 */
                s = strchr(target.user, ':');
                if (s)
                        *(s++) = '\0';
-               switch(ftpcmd("USER ", target.user, sfp, buf)) {
-                       case 230:
+               switch (ftpcmd("USER ", target.user, sfp, buf)) {
+               case 230:
+                       break;
+               case 331:
+                       if (ftpcmd("PASS ", s, sfp, buf) == 230)
                                break;
-                       case 331:
-                               if (ftpcmd("PASS ", s, sfp, buf) == 230)
-                                       break;
-                               /* FALLTHRU (failed login) */
-                       default:
-                               close_delete_and_die("ftp login: %s", buf+4);
+                       /* FALLTHRU (failed login) */
+               default:
+                       bb_error_msg_and_die("ftp login: %s", buf+4);
                }
-               
-               ftpcmd("CDUP", NULL, sfp, buf);
+
                ftpcmd("TYPE I", NULL, sfp, buf);
-               
+
                /*
                 * Querying file size
                 */
-               if (ftpcmd("SIZE /", target.path, sfp, buf) == 213) {
-                       filesize = atol(buf+4);
+               if (ftpcmd("SIZE ", target.path, sfp, buf) == 213) {
+                       content_len = BB_STRTOOFF(buf+4, NULL, 10);
+                       if (errno || content_len < 0) {
+                               bb_error_msg_and_die("SIZE value is garbage");
+                       }
                        got_clen = 1;
                }
-               
+
                /*
                 * Entering passive mode
                 */
-               if (ftpcmd("PASV", NULL, sfp, buf) !=  227)
-                       close_delete_and_die("PASV: %s", buf+4);
+               if (ftpcmd("PASV", NULL, sfp, buf) != 227) {
+ pasv_error:
+                       bb_error_msg_and_die("bad response to %s: %s", "PASV", buf);
+               }
+               // Response is "227 garbageN1,N2,N3,N4,P1,P2[)garbage]
+               // Server's IP is N1.N2.N3.N4 (we ignore it)
+               // Server's port for data connection is P1*256+P2
+               s = strrchr(buf, ')');
+               if (s) s[0] = '\0';
                s = strrchr(buf, ',');
-               *s = 0;
-               port = atoi(s+1);
+               if (!s) goto pasv_error;
+               port = xatou_range(s+1, 0, 255);
+               *s = '\0';
                s = strrchr(buf, ',');
-               port += atoi(s+1) * 256;
-               dfp = open_socket(server.host, port);
-
-               if (do_continue) {
-                       sprintf(buf, "REST %ld", beg_range);
-                       if (ftpcmd(buf, NULL, sfp, buf) != 350) {
-                               if (output != stdout)
-                                       output = freopen(fname_out, "w", output);
-                               do_continue = 0;
-                       } else
-                               filesize -= beg_range;
+               if (!s) goto pasv_error;
+               port += xatou_range(s+1, 0, 255) * 256;
+               set_nport(lsa, htons(port));
+               dfp = open_socket(lsa);
+
+               if (beg_range) {
+                       sprintf(buf, "REST %"OFF_FMT"d", beg_range);
+                       if (ftpcmd(buf, NULL, sfp, buf) == 350)
+                               content_len -= beg_range;
                }
-               
-               if (ftpcmd("RETR /", target.path, sfp, buf) > 150)
-                       close_delete_and_die("RETR: %s", buf+4);
 
+               if (ftpcmd("RETR ", target.path, sfp, buf) > 150)
+                       bb_error_msg_and_die("bad response to RETR: %s", buf);
        }
 
 
@@ -482,43 +443,56 @@ read_response:
         */
        if (chunked) {
                fgets(buf, sizeof(buf), dfp);
-               filesize = strtol(buf, (char **) NULL, 16);
+               content_len = STRTOOFF(buf, NULL, 16);
+               /* FIXME: error check?? */
        }
-#ifdef CONFIG_FEATURE_WGET_STATUSBAR
-       if (quiet_flag==FALSE)
+
+       /* Do it before progressmeter (want to have nice error message) */
+       if (output_fd < 0)
+               output_fd = xopen(fname_out,
+                       O_WRONLY|O_CREAT|O_EXCL|O_TRUNC);
+
+       if (!(opt & WGET_OPT_QUIET))
                progressmeter(-1);
-#endif
+
        do {
-               while ((filesize > 0 || !got_clen) && (n = safe_fread(buf, 1, ((chunked || got_clen) && (filesize < sizeof(buf)) ? filesize : sizeof(buf)), dfp)) > 0) {
-                       if (safe_fwrite(buf, 1, n, output) != n) {
-                               bb_perror_msg_and_die("write error");
+               while (content_len > 0 || !got_clen) {
+                       unsigned rdsz = sizeof(buf);
+                       if (content_len < sizeof(buf) && (chunked || got_clen))
+                               rdsz = (unsigned)content_len;
+                       n = safe_fread(buf, 1, rdsz, dfp);
+                       if (n <= 0)
+                               break;
+                       if (full_write(output_fd, buf, n) != n) {
+                               bb_perror_msg_and_die(bb_msg_write_error);
                        }
-#ifdef CONFIG_FEATURE_WGET_STATUSBAR
-                       statbytes+=n;
+#if ENABLE_FEATURE_WGET_STATUSBAR
+                       transferred += n;
 #endif
                        if (got_clen) {
-                               filesize -= n;
+                               content_len -= n;
                        }
                }
 
                if (chunked) {
                        safe_fgets(buf, sizeof(buf), dfp); /* This is a newline */
                        safe_fgets(buf, sizeof(buf), dfp);
-                       filesize = strtol(buf, (char **) NULL, 16);
-                       if (filesize==0) {
+                       content_len = STRTOOFF(buf, NULL, 16);
+                       /* FIXME: error check? */
+                       if (content_len == 0) {
                                chunked = 0; /* all done! */
                        }
                }
 
                if (n == 0 && ferror(dfp)) {
-                       bb_perror_msg_and_die("network read error");
+                       bb_perror_msg_and_die(bb_msg_read_error);
                }
        } while (chunked);
-#ifdef CONFIG_FEATURE_WGET_STATUSBAR
-       if (quiet_flag==FALSE)
+
+       if (!(opt & WGET_OPT_QUIET))
                progressmeter(1);
-#endif
-       if (!proxy && target.is_ftp) {
+
+       if ((use_proxy == 0) && target.is_ftp) {
                fclose(dfp);
                if (ftpcmd(NULL, NULL, sfp, buf) != 226)
                        bb_error_msg_and_die("ftp error: %s", buf+4);
@@ -528,82 +502,80 @@ read_response:
 }
 
 
-void parse_url(char *url, struct host_info *h)
+static void parse_url(char *src_url, struct host_info *h)
 {
-       char *cp, *sp, *up, *pp;
+       char *url, *p, *sp;
+
+       /* h->allocated = */ url = xstrdup(src_url);
 
        if (strncmp(url, "http://", 7) == 0) {
-               h->port = 80;
+               h->port = bb_lookup_port("http", "tcp", 80);
                h->host = url + 7;
                h->is_ftp = 0;
        } else if (strncmp(url, "ftp://", 6) == 0) {
-               h->port = 21;
+               h->port = bb_lookup_port("ftp", "tcp", 21);
                h->host = url + 6;
                h->is_ftp = 1;
        } else
                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' (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')
+       // 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, '/');
-       if (sp != NULL) {
-               *sp++ = '\0';
+       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';
+               h->path = sp + 1;
+       } else { // '#' or '?'
+               // 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;
-       } else
-               h->path = bb_xstrdup("");
-
-       up = strrchr(h->host, '@');
-       if (up != NULL) {
-               h->user = h->host;
-               *up++ = '\0';
-               h->host = up;
-       } else
-               h->user = NULL;
-
-       pp = h->host;
-
-#ifdef CONFIG_FEATURE_WGET_IP6_LITERAL
-       if (h->host[0] == '[') {
-               char *ep;
-
-               ep = h->host + 1;
-               while (*ep == ':' || isxdigit (*ep))
-                       ep++;
-               if (*ep == ']') {
-                       h->host++;
-                       *ep = '\0';
-                       pp = ep + 1;
-               }
        }
-#endif
 
-       cp = strchr(pp, ':');
-       if (cp != NULL) {
-               *cp++ = '\0';
-               h->port = atoi(cp);
+       sp = strrchr(h->host, '@');
+       h->user = NULL;
+       if (sp != NULL) {
+               h->user = h->host;
+               *sp = '\0';
+               h->host = sp + 1;
        }
 
+       sp = h->host;
 }
 
 
-FILE *open_socket(char *host, int port)
+static FILE *open_socket(len_and_sockaddr *lsa)
 {
-       int fd;
        FILE *fp;
-       char port_str[10];
 
-       snprintf(port_str, sizeof(port_str), "%d", port);
-       fd=xconnect(host, port_str);
-
-       /*
-        * Get the server onto a stdio stream.
-        */
-       if ((fp = fdopen(fd, "r+")) == NULL)
-               bb_perror_msg_and_die("fdopen()");
+       /* glibc 2.4 seems to try seeking on it - ??! */
+       /* hopefully it understands what ESPIPE means... */
+       fp = fdopen(xconnect_stream(lsa), "r+");
+       if (fp == NULL)
+               bb_perror_msg_and_die("fdopen");
 
        return fp;
 }
 
 
-char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc)
+static char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc)
 {
        char *s, *hdrval;
        int c;
@@ -615,13 +587,13 @@ char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc)
                return NULL;
 
        /* see if we are at the end of the headers */
-       for (s = buf ; *s == '\r' ; ++s)
+       for (s = buf; *s == '\r'; ++s)
                ;
        if (s[0] == '\n')
                return NULL;
 
        /* convert the header name to lower case */
-       for (s = buf ; isalnum(*s) || *s == '-' ; ++s)
+       for (s = buf; isalnum(*s) || *s == '-'; ++s)
                *s = tolower(*s);
 
        /* verify we are at the end of the header name */
@@ -629,7 +601,7 @@ char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc)
                bb_error_msg_and_die("bad header line: %s", buf);
 
        /* locate the start of the header value */
-       for (*s++ = '\0' ; *s == ' ' || *s == '\t' ; ++s)
+       for (*s++ = '\0'; *s == ' ' || *s == '\t'; ++s)
                ;
        hdrval = s;
 
@@ -652,39 +624,41 @@ char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc)
 
 static int ftpcmd(char *s1, char *s2, FILE *fp, char *buf)
 {
-       char *p;
-       
+       int result;
        if (s1) {
-               if (!s2) s2="";
+               if (!s2) s2 = "";
                fprintf(fp, "%s%s\r\n", s1, s2);
                fflush(fp);
        }
-       
+
        do {
-               p = fgets(buf, 510, fp);
-               if (!p)
-                       bb_perror_msg_and_die("fgets()");
-       } while (! isdigit(buf[0]) || buf[3] != ' ');
-       
-       return atoi(buf);
-}
+               char *buf_ptr;
 
-#ifdef CONFIG_FEATURE_WGET_STATUSBAR
-/* Stuff below is from BSD rcp util.c, as added to openshh. 
- * Original copyright notice is retained at the end of this file.
- * 
- */ 
+               if (fgets(buf, 510, fp) == NULL) {
+                       bb_perror_msg_and_die("error getting response");
+               }
+               buf_ptr = strstr(buf, "\r\n");
+               if (buf_ptr) {
+                       *buf_ptr = '\0';
+               }
+       } while (!isdigit(buf[0]) || buf[3] != ' ');
 
+       buf[3] = '\0';
+       result = xatoi_u(buf);
+       buf[3] = ' ';
+       return result;
+}
 
+#if ENABLE_FEATURE_WGET_STATUSBAR
+/* Stuff below is from BSD rcp util.c, as added to openshh.
+ * Original copyright notice is retained at the end of this file.
+ */
 static int
 getttywidth(void)
 {
-       struct winsize winsize;
-
-       if (ioctl(fileno(stdout), TIOCGWINSZ, &winsize) != -1)
-               return (winsize.ws_col ? winsize.ws_col : 80);
-       else
-               return (80);
+       int width;
+       get_terminal_width_height(0, &width, NULL);
+       return width;
 }
 
 static void
@@ -696,12 +670,11 @@ updateprogressmeter(int ignore)
        errno = save_errno;
 }
 
-static void
-alarmtimer(int wait)
+static void alarmtimer(int iwait)
 {
        struct itimerval itv;
 
-       itv.it_value.tv_sec = wait;
+       itv.it_value.tv_sec = iwait;
        itv.it_value.tv_usec = 0;
        itv.it_interval = itv.it_value;
        setitimer(ITIMER_REAL, &itv, NULL);
@@ -711,104 +684,92 @@ alarmtimer(int wait)
 static void
 progressmeter(int flag)
 {
-       static const char prefixes[] = " KMGTP";
        static struct timeval lastupdate;
        static off_t lastsize, totalsize;
-       struct timeval now, td, wait;
-       off_t cursize, abbrevsize;
-       double elapsed;
-       int ratio, barlength, i, remaining;
+
+       struct timeval now, td, tvwait;
+       off_t abbrevsize;
+       int elapsed, ratio, barlength, i;
        char buf[256];
 
-       if (flag == -1) {
-               (void) gettimeofday(&start, (struct timezone *) 0);
+       if (flag == -1) { /* first call to progressmeter */
+               gettimeofday(&start, (struct timezone *) 0);
                lastupdate = start;
                lastsize = 0;
-               totalsize = filesize; /* as filesize changes.. */
+               totalsize = content_len + beg_range; /* as content_len changes.. */
        }
 
-       (void) gettimeofday(&now, (struct timezone *) 0);
-       cursize = statbytes;
+       gettimeofday(&now, (struct timezone *) 0);
+       ratio = 100;
        if (totalsize != 0 && !chunked) {
-               ratio = 100.0 * cursize / totalsize;
-               ratio = MAX(ratio, 0);
+               /* long long helps to have working ETA even if !LFS */
+               ratio = (int) (100 * (unsigned long long)(transferred+beg_range) / totalsize);
                ratio = MIN(ratio, 100);
-       } else
-               ratio = 100;
+       }
 
-       snprintf(buf, sizeof(buf), "\r%-20.20s %3d%% ", curfile, ratio);
+       fprintf(stderr, "\r%-20.20s%4d%% ", curfile, ratio);
 
        barlength = getttywidth() - 51;
-       if (barlength > 0) {
+       if (barlength > 0 && barlength < sizeof(buf)) {
                i = barlength * ratio / 100;
-               snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-                        "|%.*s%*s|", i,
-                        "*****************************************************************************"
-                        "*****************************************************************************",
-                        barlength - i, "");
+               memset(buf, '*', i);
+               memset(buf + i, ' ', barlength - i);
+               buf[barlength] = '\0';
+               fprintf(stderr, "|%s|", buf);
        }
        i = 0;
-       abbrevsize = cursize;
-       while (abbrevsize >= 100000 && i < sizeof(prefixes)) {
+       abbrevsize = transferred + beg_range;
+       while (abbrevsize >= 100000) {
                i++;
                abbrevsize >>= 10;
        }
-       snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %5d %c%c ",
-            (int) abbrevsize, prefixes[i], prefixes[i] == ' ' ? ' ' :
-                'B');
+       /* see http://en.wikipedia.org/wiki/Tera */
+       fprintf(stderr, "%6d %c%c ", (int)abbrevsize, " KMGTPEZY"[i], i?'B':' ');
 
-       timersub(&now, &lastupdate, &wait);
-       if (cursize > lastsize) {
+       timersub(&now, &lastupdate, &tvwait);
+       if (transferred > lastsize) {
                lastupdate = now;
-               lastsize = cursize;
-               if (wait.tv_sec >= STALLTIME) {
-                       start.tv_sec += wait.tv_sec;
-                       start.tv_usec += wait.tv_usec;
-               }
-               wait.tv_sec = 0;
+               lastsize = transferred;
+               if (tvwait.tv_sec >= STALLTIME)
+                       timeradd(&start, &tvwait, &start);
+               tvwait.tv_sec = 0;
        }
        timersub(&now, &start, &td);
-       elapsed = td.tv_sec + (td.tv_usec / 1000000.0);
-
-       if (wait.tv_sec >= STALLTIME) {
-               snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-                        " - stalled -");
-       } else if (statbytes <= 0 || elapsed <= 0.0 || cursize > totalsize || chunked) {
-               snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-                        "   --:-- ETA");
+       elapsed = td.tv_sec;
+
+       if (tvwait.tv_sec >= STALLTIME) {
+               fprintf(stderr, " - stalled -");
        } else {
-               remaining = (int) (totalsize / (statbytes / elapsed) - elapsed);
-               i = remaining / 3600;
-               if (i)
-                       snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-                                "%2d:", i);
-               else
-                       snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-                                "   ");
-               i = remaining % 3600;
-               snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-                        "%02d:%02d ETA", i / 60, i % 60);
+               off_t to_download = totalsize - beg_range;
+               if (transferred <= 0 || elapsed <= 0 || transferred > to_download || chunked) {
+                       fprintf(stderr, "--:--:-- ETA");
+               } else {
+                       /* to_download / (transferred/elapsed) - elapsed: */
+                       int eta = (int) ((unsigned long long)to_download*elapsed/transferred - elapsed);
+                       /* (long long helps to have working ETA even if !LFS) */
+                       i = eta % 3600;
+                       fprintf(stderr, "%02d:%02d:%02d ETA", eta / 3600, i / 60, i % 60);
+               }
        }
-       write(fileno(stderr), buf, strlen(buf));
 
-       if (flag == -1) {
+       if (flag == -1) { /* first call to progressmeter */
                struct sigaction sa;
                sa.sa_handler = updateprogressmeter;
                sigemptyset(&sa.sa_mask);
                sa.sa_flags = SA_RESTART;
                sigaction(SIGALRM, &sa, NULL);
                alarmtimer(1);
-       } else if (flag == 1) {
+       } else if (flag == 1) { /* last call to progressmeter */
                alarmtimer(0);
-               statbytes = 0;
+               transferred = 0;
                putc('\n', stderr);
        }
 }
 #endif
 
 /* Original copyright notice which applies to the CONFIG_FEATURE_WGET_STATUSBAR stuff,
- * much of which was blatently stolen from openssh.  */
+ * much of which was blatantly stolen from openssh.  */
+
 /*-
  * Copyright (c) 1992, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -822,8 +783,8 @@ progressmeter(int flag)
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change 
- *             ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> 
+ * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
+ *             ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
  *
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
@@ -841,15 +802,4 @@ progressmeter(int flag)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     $Id: wget.c,v 1.59 2003/09/11 08:25:11 andersen Exp $
  */
-
-
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/