Robin Farine writes:
[oweals/busybox.git] / networking / wget.c
index 77c72cbc3f4278a248ee4eb5915b86638110be15..e233daf050748122532525c0100a9b3cf3ee9460 100644 (file)
@@ -1,21 +1,13 @@
 /* vi: set sw=4 ts=4: */
 /*
- * wget - retrieve a file using HTTP
+ * wget - retrieve a file using HTTP or FTP
  *
  * Chip Rosenthal Covad Communications <chip@laserlink.net>
  *
- * Note: According to RFC2616 section 3.6.1, "All HTTP/1.1 applications MUST be
- * able to receive and decode the "chunked" transfer-coding, and MUST ignore
- * chunk-extension extensions they do not understand."  
- *
- * This prevents this particular wget app from completely RFC compliant, and as
- * such, prevents it from being used as a general purpose web browser...  This
- * is a design decision, since it makes the code smaller.
- *
  */
 
-#include "busybox.h"
 #include <stdio.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <getopt.h>
 
-void parse_url(char *url, char **uri_host, int *uri_port, char **uri_path);
-FILE *open_socket(char *host, int port);
-char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc);
-void progressmeter(int flag);
+#include "busybox.h"
+
+struct host_info {
+       char *host;
+       int port;
+       char *path;
+       int is_ftp;
+       char *user;
+};
+
+static void parse_url(char *url, struct host_info *h);
+static FILE *open_socket(struct sockaddr_in *s_in);
+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 */
-#ifdef BB_FEATURE_WGET_STATUSBAR
+static int chunked = 0;                        /* chunked transfer encoding */
+#ifdef CONFIG_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. */
-volatile unsigned long statbytes; /* Number of bytes transferred so far. */
+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;
 #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
+ * error is encountered.  */
+static size_t safe_fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
+{
+       size_t ret = 0;
+
+       do {
+               clearerr(stream);
+               ret += fread((char *)ptr + (ret * size), size, nmemb - ret, stream);
+       } while (ret < nmemb && ferror(stream) && errno == EINTR);
+
+       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)
+{
+       char *ret;
+
+       do {
+               clearerr(stream);
+               ret = fgets(s, size, stream);
+       } while (ret == NULL && ferror(stream) && errno == EINTR);
+
+       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
+/*
+ *  Base64-encode character string
+ *  oops... isn't something similar in uuencode.c?
+ *  It would be better to use already existing code
+ */
+char *base64enc(unsigned 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;
+}
+#endif
+
+#define WGET_OPT_CONTINUE      1
+#define WGET_OPT_QUIET 2
+#define WGET_OPT_PASSIVE       4
+#define WGET_OPT_OUTNAME       8
+#define WGET_OPT_HEADER        16
+#define WGET_OPT_PREFIX        32
+#define WGET_OPT_PROXY 64
+
+static const struct option wget_long_options[] = {
+       { "continue",        0, NULL, 'c' },
+       { "quiet",           0, NULL, 'q' },
+       { "passive-ftp",     0, NULL, 139 },
+       { "output-document", 1, NULL, 'O' },
+       { "header",              1, NULL, 131 },
+       { "directory-prefix",1, NULL, 'P' },
+       { "proxy",           1, NULL, 'Y' },
+       { 0,                 0, 0, 0 }
+};
+
 int wget_main(int argc, char **argv)
 {
-       int n;
-       char *proxy, *proxy_host;
-       int uri_port, proxy_port;
+       int n, try=5, status;
+       unsigned long opt;
+       int port;
+       char *proxy = 0;
+       char *dir_prefix=NULL;
        char *s, buf[512];
        struct stat sbuf;
-
-       FILE *sfp;                                      /* socket to web server                         */
-       char *uri_host, *uri_path;      /* parsed from command line url         */
+       char extra_headers[1024];
+       char *extra_headers_ptr = extra_headers;
+       int extra_headers_left = sizeof(extra_headers);
+       struct host_info server, target;
+       struct sockaddr_in s_in;
+       llist_t *headers_llist = 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 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 use_proxy = 1;          /* Use proxies if env vars are set  */
+       char *proxy_flag = "on";        /* Use proxies if env vars are set  */
 
        /*
         * Crack command line.
         */
-       while ((n = getopt(argc, argv, "cqO:")) != EOF) {
-               switch (n) {
-               case 'c':
-                       ++do_continue;
-                       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 = (strcmp(optarg, "-") == 0 ? (char *)1 : optarg);
-                       break;
-               default:
-                       usage(wget_usage);
+       bb_opt_complementaly = "\203*";
+       bb_applet_long_options = wget_long_options;
+       opt = bb_getopt_ulflags(argc, argv, "cq\213O:\203:P:Y:", &fname_out, &headers_llist, &dir_prefix, &proxy_flag);
+       if (opt & WGET_OPT_CONTINUE) {
+               ++do_continue;
+       }
+       if (opt & WGET_OPT_QUIET) {
+               quiet_flag = TRUE;
+       }
+       if (strcmp(proxy_flag, "off") == 0) {
+               /* Use the proxy if necessary. */
+               use_proxy = 0;
+       }
+       if (opt & WGET_OPT_HEADER) {
+               while (headers_llist) {
+                       int arglen = strlen(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;
                }
        }
-
        if (argc - optind != 1)
-                       usage(wget_usage);
+                       bb_show_usage();
 
-       if (do_continue && !fname_out)
-               error_msg_and_die("cannot specify continue (-c) without a filename (-O)\n");
+       parse_url(argv[optind], &target);
+       server.host = target.host;
+       server.port = target.port;
 
        /*
         * Use the proxy if necessary.
         */
-       if ((proxy = getenv("http_proxy")) != NULL) {
-               proxy = xstrdup(proxy);
-               parse_url(proxy, &proxy_host, &proxy_port, &uri_path);
-               parse_url(argv[optind], &uri_host, &uri_port, &uri_path);
-       } else {
-               /*
-                * Parse url into components.
-                */
-               parse_url(argv[optind], &uri_host, &uri_port, &uri_path);
-               proxy_host=uri_host;
-               proxy_port=uri_port;
+       if (use_proxy) {
+               proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
+               if (proxy && *proxy) {
+                       parse_url(bb_xstrdup(proxy), &server);
+               } else {
+                       use_proxy = 0;
+               }
        }
-       
+
        /* Guess an output filename */
        if (!fname_out) {
-               fname_out = 
-#ifdef BB_FEATURE_WGET_STATUSBAR
-                       curfile = 
+               fname_out =
+#ifdef CONFIG_FEATURE_WGET_STATUSBAR
+                       curfile =
 #endif
-                       get_last_path_component(uri_path);
+                       bb_get_last_path_component(target.path);
                if (fname_out==NULL || strlen(fname_out)<1) {
-                       fname_out = 
-#ifdef BB_FEATURE_WGET_STATUSBAR
-                               curfile = 
+                       fname_out =
+#ifdef CONFIG_FEATURE_WGET_STATUSBAR
+                               curfile =
 #endif
                                "index.html";
                }
-#ifdef BB_FEATURE_WGET_STATUSBAR
+               if (dir_prefix != NULL)
+                       fname_out = concat_path_file(dir_prefix, fname_out);
+#ifdef CONFIG_FEATURE_WGET_STATUSBAR
        } else {
-               curfile=argv[optind];
+               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)");
 
 
-       /*
-        * Open socket to server.
-        */
-       sfp = open_socket(proxy_host, proxy_port);
-
-       /* Make the assumption that if the file already exists
-        * on disk that the intention is to continue downloading
-        * a previously aborted download  -Erik */
-       if (stat(fname_out, &sbuf) == 0) {
-               ++do_continue;
-       }
-
        /*
         * Open the output file stream.
         */
-       if (fname_out != (char *)1) {
-               if ( (output=fopen(fname_out, (do_continue ? "a" : "w"))) 
-                               == NULL)
-                       perror_msg_and_die("fopen(%s)", fname_out);
-       } else {
+       if (strcmp(fname_out, "-") == 0) {
                output = stdout;
+               quiet_flag = TRUE;
+       } else {
+               output = bb_xfopen(fname_out, (do_continue ? "a" : "w"));
        }
 
        /*
@@ -159,136 +277,335 @@ int wget_main(int argc, char **argv)
         */
        if (do_continue) {
                if (fstat(fileno(output), &sbuf) < 0)
-                       perror_msg_and_die("fstat()");
+                       bb_perror_msg_and_die("fstat()");
                if (sbuf.st_size > 0)
                        beg_range = sbuf.st_size;
                else
                        do_continue = 0;
        }
 
-       /*
-        * Send HTTP request.
-        */
-       fprintf(sfp, "GET http://%s:%d/%s HTTP/1.1\r\n", 
-                       uri_host, uri_port, uri_path);
-       fprintf(sfp, "Host: %s\r\nUser-Agent: Wget\r\n", uri_host);
-       if (do_continue)
-               fprintf(sfp, "Range: bytes=%ld-\r\n", beg_range);
-       fprintf(sfp,"Connection: close\r\n\r\n");
-
-       /*
-        * Retrieve HTTP response line and check for "200" status code.
-        */
-       if (fgets(buf, sizeof(buf), sfp) == NULL) {
-               error_msg_and_die("no response from server\n");
+       /* 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... */
+       bb_lookup_host(&s_in, server.host);
+       s_in.sin_port = server.port;
+       if (quiet_flag==FALSE) {
+               fprintf(stdout, "Connecting to %s[%s]:%d\n",
+                               server.host, inet_ntoa(s_in.sin_addr), ntohs(server.port));
        }
-       for (s = buf ; *s != '\0' && !isspace(*s) ; ++s)
-               ;
-       for ( ; isspace(*s) ; ++s)
-               ;
-       switch (atoi(s)) {
-               case 200:
-                       if (!do_continue)
-                               break;
-                       error_msg_and_die("server does not support ranges\n");
-               case 206:
+
+       if (use_proxy || !target.is_ftp) {
+               /*
+                *  HTTP session
+                */
+               do {
+                       got_clen = chunked = 0;
+
+                       if (! --try)
+                               close_delete_and_die("too many redirections");
+
+                       /*
+                        * Open socket to http server
+                        */
+                       if (sfp) fclose(sfp);
+                       sfp = open_socket(&s_in);
+
+                       /*
+                        * Send HTTP request.
+                        */
+                       if (use_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,
+                                       target.is_ftp ? "f" : "ht", target.host,
+                                       ntohs(target.port), 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);
+
+#ifdef CONFIG_FEATURE_WGET_AUTHENTICATION
+                       if (target.user) {
+                               fprintf(sfp, "Authorization: Basic %s\r\n",
+                                       base64enc(target.user, buf, sizeof(buf)));
+                       }
+                       if (use_proxy && server.user) {
+                               fprintf(sfp, "Proxy-Authorization: Basic %s\r\n",
+                                       base64enc(server.user, buf, sizeof(buf)));
+                       }
+#endif
+
                        if (do_continue)
-                               break;
-                       /*FALLTHRU*/
-               default:
-                       error_msg_and_die("server returned error: %s", buf);
+                               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");
+
+                       /*
+                       * 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:
+                                       break;
+                               case 206:
+                                       if (do_continue)
+                                               break;
+                                       /*FALLTHRU*/
+                               default:
+                                       chomp(buf);
+                                       close_delete_and_die("server returned error %d: %s", atoi(s), buf);
+                       }
+
+                       /*
+                        * Retrieve HTTP headers.
+                        */
+                       while ((s = gethdr(buf, sizeof(buf), sfp, &n)) != NULL) {
+                               if (strcasecmp(buf, "content-length") == 0) {
+                                       unsigned long value;
+                                       if (safe_strtoul(s, &value)) {
+                                               close_delete_and_die("content-length %s is garbage", s);
+                                       }
+                                       filesize = value;
+                                       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(buf, "location") == 0) {
+                                       if (s[0] == '/')
+                                               target.path = bb_xstrdup(s+1);
+                                       else {
+                                               parse_url(bb_xstrdup(s), &target);
+                                               if (use_proxy == 0) {
+                                                       server.host = target.host;
+                                                       server.port = target.port;
+                                               }
+                                               bb_lookup_host(&s_in, server.host);
+                                               s_in.sin_port = server.port;
+                                               break;
+                                       }
+                               }
+                       }
+               } while(status >= 300);
+
+               dfp = sfp;
        }
+       else
+       {
+               /*
+                *  FTP session
+                */
+               if (! target.user)
+                       target.user = bb_xstrdup("anonymous:busybox@");
 
-       /*
-        * Retrieve HTTP headers.
-        */
-       while ((s = gethdr(buf, sizeof(buf), sfp, &n)) != NULL) {
-               if (strcmp(buf, "content-length") == 0) {
-                       filesize = atol(s);
+               sfp = open_socket(&s_in);
+               if (ftpcmd(NULL, NULL, sfp, buf) != 220)
+                       close_delete_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:
+                               break;
+                       case 331:
+                               if (ftpcmd("PASS ", s, sfp, buf) == 230)
+                                       break;
+                               /* FALLTHRU (failed login) */
+                       default:
+                               close_delete_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) {
+                       unsigned long value;
+                       if (safe_strtoul(buf+4, &value)) {
+                               close_delete_and_die("SIZE value is garbage");
+                       }
+                       filesize = value;
                        got_clen = 1;
-                       continue;
                }
-               if (strcmp(buf, "transfer-encoding") == 0) {
-                       error_msg_and_die("server wants to do %s transfer encoding\n", s);
-                       continue;
+
+               /*
+                * Entering passive mode
+                */
+               if (ftpcmd("PASV", NULL, sfp, buf) !=  227)
+                       close_delete_and_die("PASV: %s", buf+4);
+               s = strrchr(buf, ',');
+               *s = 0;
+               port = atoi(s+1);
+               s = strrchr(buf, ',');
+               port += atoi(s+1) * 256;
+               s_in.sin_port = htons(port);
+               dfp = open_socket(&s_in);
+
+               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 (ftpcmd("RETR /", target.path, sfp, buf) > 150)
+                       close_delete_and_die("RETR: %s", buf+4);
+
        }
 
+
        /*
-        * Retrieve HTTP body.
+        * Retrieve file
         */
-#ifdef BB_FEATURE_WGET_STATUSBAR
-       statbytes=0;
+       if (chunked) {
+               fgets(buf, sizeof(buf), dfp);
+               filesize = strtol(buf, (char **) NULL, 16);
+       }
+#ifdef CONFIG_FEATURE_WGET_STATUSBAR
        if (quiet_flag==FALSE)
                progressmeter(-1);
 #endif
-       while (filesize > 0 && (n = fread(buf, 1, sizeof(buf), sfp)) > 0) {
-               fwrite(buf, 1, n, output);
-#ifdef BB_FEATURE_WGET_STATUSBAR
-               statbytes+=n;
-               if (quiet_flag==FALSE)
-                       progressmeter(1);
+       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");
+                       }
+#ifdef CONFIG_FEATURE_WGET_STATUSBAR
+                       statbytes+=n;
 #endif
-               if (got_clen)
-                       filesize -= n;
-       }
-       if (n == 0 && ferror(sfp))
-               perror_msg_and_die("network read error");
+                       if (got_clen) {
+                               filesize -= 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) {
+                               chunked = 0; /* all done! */
+                       }
+               }
 
-       exit(0);
+               if (n == 0 && ferror(dfp)) {
+                       bb_perror_msg_and_die("network read error");
+               }
+       } while (chunked);
+#ifdef CONFIG_FEATURE_WGET_STATUSBAR
+       if (quiet_flag==FALSE)
+               progressmeter(1);
+#endif
+       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);
+               ftpcmd("QUIT", NULL, sfp, buf);
+       }
+       exit(EXIT_SUCCESS);
 }
 
 
-void parse_url(char *url, char **uri_host, int *uri_port, char **uri_path)
+void parse_url(char *url, struct host_info *h)
 {
-       char *cp, *sp;
+       char *cp, *sp, *up, *pp;
+
+       if (strncmp(url, "http://", 7) == 0) {
+               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 = bb_lookup_port("ftp", "tfp", 21);
+               h->host = url + 6;
+               h->is_ftp = 1;
+       } else
+               bb_error_msg_and_die("not an http or ftp url: %s", url);
 
-       *uri_port = 80;
+       sp = strchr(h->host, '/');
+       if (sp) {
+               *sp++ = '\0';
+               h->path = sp;
+       } else
+               h->path = bb_xstrdup("");
 
-       if (strncmp(url, "http://", 7) != 0)
-               error_msg_and_die("not an http url: %s\n", url);
+       up = strrchr(h->host, '@');
+       if (up != NULL) {
+               h->user = h->host;
+               *up++ = '\0';
+               h->host = up;
+       } else
+               h->user = NULL;
 
-       *uri_host = url + 7;
+       pp = h->host;
 
-       cp = strchr(*uri_host, ':');
-       sp = strchr(*uri_host, '/');
+#ifdef CONFIG_FEATURE_WGET_IP6_LITERAL
+       if (h->host[0] == '[') {
+               char *ep;
 
-       if (cp != NULL && (sp == NULL || cp < sp)) {
-               *cp++ = '\0';
-               *uri_port = atoi(cp);
+               ep = h->host + 1;
+               while (*ep == ':' || isxdigit (*ep))
+                       ep++;
+               if (*ep == ']') {
+                       h->host++;
+                       *ep = '\0';
+                       pp = ep + 1;
+               }
        }
+#endif
 
-       if (sp != NULL) {
-               *sp++ = '\0';
-               *uri_path = sp;
-       } else
-               *uri_path = "";
+       cp = strchr(pp, ':');
+       if (cp != NULL) {
+               *cp++ = '\0';
+               h->port = htons(atoi(cp));
+       }
 }
 
 
-FILE *open_socket(char *host, int port)
+FILE *open_socket(struct sockaddr_in *s_in)
 {
-       struct sockaddr_in sin;
-       struct hostent *hp;
-       int fd;
        FILE *fp;
 
-       memzero(&sin, sizeof(sin));
-       sin.sin_family = AF_INET;
-       if ((hp = (struct hostent *) gethostbyname(host)) == NULL)
-               error_msg_and_die("cannot resolve %s\n", host);
-       memcpy(&sin.sin_addr, hp->h_addr_list[0], hp->h_length);
-       sin.sin_port = htons(port);
-
-       /*
-        * Get the server onto a stdio stream.
-        */
-       if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-               perror_msg_and_die("socket()");
-       if (connect(fd, (struct sockaddr *) &sin, sizeof(sin)) < 0)
-               perror_msg_and_die("connect(%s)", host);
-       if ((fp = fdopen(fd, "r+")) == NULL)
-               perror_msg_and_die("fdopen()");
+       fp = fdopen(xconnect(s_in), "r+");
+       if (fp == NULL)
+               bb_perror_msg_and_die("fdopen()");
 
        return fp;
 }
@@ -317,7 +634,7 @@ char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc)
 
        /* verify we are at the end of the header name */
        if (*s != ':')
-               error_msg_and_die("bad header line: %s\n", buf);
+               bb_error_msg_and_die("bad header line: %s", buf);
 
        /* locate the start of the header value */
        for (*s++ = '\0' ; *s == ' ' || *s == '\t' ; ++s)
@@ -341,25 +658,45 @@ char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc)
        return hdrval;
 }
 
-#ifdef BB_FEATURE_WGET_STATUSBAR
-/* Stuff below is from BSD rcp util.c, as added to openshh. 
+static int ftpcmd(char *s1, char *s2, FILE *fp, char *buf)
+{
+       if (s1) {
+               if (!s2) s2="";
+               fprintf(fp, "%s%s\r\n", s1, s2);
+               fflush(fp);
+       }
+
+       do {
+               char *buf_ptr;
+
+               if (fgets(buf, 510, fp) == NULL) {
+                       bb_perror_msg_and_die("fgets()");
+               }
+               buf_ptr = strstr(buf, "\r\n");
+               if (buf_ptr) {
+                       *buf_ptr = '\0';
+               }
+       } while (! isdigit(buf[0]) || buf[3] != ' ');
+
+       return atoi(buf);
+}
+
+#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.
- * 
- */ 
+ *
+ */
 
 
-int
+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=0;
+       get_terminal_width_height(0, &width, NULL);
+       return (width);
 }
 
-void
+static void
 updateprogressmeter(int ignore)
 {
        int save_errno = errno;
@@ -368,7 +705,7 @@ updateprogressmeter(int ignore)
        errno = save_errno;
 }
 
-void
+static void
 alarmtimer(int wait)
 {
        struct itimerval itv;
@@ -380,12 +717,12 @@ alarmtimer(int wait)
 }
 
 
-void
+static void
 progressmeter(int flag)
 {
        static const char prefixes[] = " KMGTP";
        static struct timeval lastupdate;
-       static off_t lastsize;
+       static off_t lastsize, totalsize;
        struct timeval now, td, wait;
        off_t cursize, abbrevsize;
        double elapsed;
@@ -396,12 +733,13 @@ progressmeter(int flag)
                (void) gettimeofday(&start, (struct timezone *) 0);
                lastupdate = start;
                lastsize = 0;
+               totalsize = filesize; /* as filesize changes.. */
        }
 
        (void) gettimeofday(&now, (struct timezone *) 0);
        cursize = statbytes;
-       if (filesize != 0) {
-               ratio = 100.0 * cursize / filesize;
+       if (totalsize != 0 && !chunked) {
+               ratio = 100.0 * cursize / totalsize;
                ratio = MAX(ratio, 0);
                ratio = MIN(ratio, 100);
        } else
@@ -441,14 +779,14 @@ progressmeter(int flag)
        timersub(&now, &start, &td);
        elapsed = td.tv_sec + (td.tv_usec / 1000000.0);
 
-       if (statbytes <= 0 || elapsed <= 0.0 || cursize > filesize) {
-               snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-                        "   --:-- ETA");
-       } else if (wait.tv_sec >= STALLTIME) {
+       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");
        } else {
-               remaining = (int) (filesize / (statbytes / elapsed) - elapsed);
+               remaining = (int) (totalsize / (statbytes / elapsed) - elapsed);
                i = remaining / 3600;
                if (i)
                        snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
@@ -460,7 +798,7 @@ progressmeter(int flag)
                snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
                         "%02d:%02d ETA", i / 60, i % 60);
        }
-       write(fileno(stderr), buf, strlen(buf));
+       write(STDERR_FILENO, buf, strlen(buf));
 
        if (flag == -1) {
                struct sigaction sa;
@@ -472,13 +810,14 @@ progressmeter(int flag)
        } else if (flag == 1) {
                alarmtimer(0);
                statbytes = 0;
+               putc('\n', stderr);
        }
 }
 #endif
 
-/* Original copyright notice which applies to the BB_FEATURE_WGET_STATUSBAR stuff,
- * much of which was blatently stolen from openssh.  */
+/* Original copyright notice which applies to the CONFIG_FEATURE_WGET_STATUSBAR stuff,
+ * much of which was blatantly stolen from openssh.  */
+
 /*-
  * Copyright (c) 1992, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -492,8 +831,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
@@ -511,7 +850,7 @@ progressmeter(int flag)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     $Id: wget.c,v 1.20 2001/01/24 18:44:54 andersen Exp $
+ *     $Id: wget.c,v 1.74 2004/04/14 17:51:24 andersen Exp $
  */
 
 
@@ -523,6 +862,3 @@ c-basic-offset: 4
 tab-width: 4
 End:
 */
-
-
-