/* 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.
- *
*/
-#warning This applet has moved to netkit-tiny. After BusyBox 0.49, this
-#warning applet will be removed from BusyBox. All maintenance efforts
-#warning should be done in the netkit-tiny source tree.
-
-#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>
+
+#include "busybox.h"
+
+struct host_info {
+ char *host;
+ int port;
+ char *path;
+ int is_ftp;
+ char *user;
+};
-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);
+static void parse_url(char *url, struct host_info *h);
+static FILE *open_socket(char *host, int port);
+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(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
int wget_main(int argc, char **argv)
{
- int n;
- char *proxy, *proxy_host;
- int uri_port, proxy_port;
+ int n, try=5, status;
+ 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);
+ int which_long_opt = 0, option_index = -1;
+ struct host_info server, target;
+
+ 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(argc, argv, "cqO:")) != EOF) {
+ 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;
* this gets interpreted as the auto-gen output filename
* case below - tausq@debian.org
*/
- fname_out = (strcmp(optarg, "-") == 0 ? (char *)1 : optarg);
+ 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:
- usage(wget_usage);
+ bb_show_usage();
}
}
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 (!noproxy) {
+ proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
+ if (proxy)
+ parse_url(bb_xstrdup(proxy), &server);
}
/* Guess an output filename */
if (!fname_out) {
fname_out =
-#ifdef BB_FEATURE_WGET_STATUSBAR
+#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
+#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"));
}
/*
*/
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");
+ if (proxy || !target.is_ftp) {
+ /*
+ * HTTP session
+ */
+ do {
+ if (! --try)
+ close_delete_and_die("too many redirections");
+
+ /*
+ * Open socket to http server
+ */
+ if (sfp) fclose(sfp);
+ sfp = open_socket(server.host, server.port);
+
+ /*
+ * Send HTTP request.
+ */
+ if (proxy) {
+ fprintf(sfp, "GET %stp://%s:%d/%s HTTP/1.1\r\n",
+ target.is_ftp ? "f" : "ht", target.host,
+ 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 (proxy && server.user) {
+ fprintf(sfp, "Proxy-Authorization: Basic %s\r\n",
+ base64enc(server.user, buf, sizeof(buf)));
+ }
+#endif
- /*
- * 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");
- }
- 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 (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) {
+ filesize = atol(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(buf, "location") == 0) {
+ if (s[0] == '/')
+ target.path = bb_xstrdup(s+1);
+ else {
+ parse_url(bb_xstrdup(s), &target);
+ if (!proxy) {
+ server.host = target.host;
+ server.port = target.port;
+ }
+ }
+ }
+ }
+ } 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(server.host, server.port);
+ 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) {
+ filesize = atol(buf+4);
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;
+ 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 (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
+ do {
+ while ((filesize > 0 || !got_clen) && (n = safe_fread(buf, 1, chunked ? (filesize > sizeof(buf) ? 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;
- if (quiet_flag==FALSE)
- progressmeter(1);
#endif
if (got_clen)
filesize -= n;
}
- if (n == 0 && ferror(sfp))
- perror_msg_and_die("network read error");
- exit(0);
+ 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! */
+ }
+
+ 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 (!proxy && 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;
-
- *uri_port = 80;
-
- if (strncmp(url, "http://", 7) != 0)
- error_msg_and_die("not an http url: %s\n", url);
+ char *cp, *sp, *up;
+
+ if (strncmp(url, "http://", 7) == 0) {
+ h->port = 80;
+ h->host = url + 7;
+ h->is_ftp = 0;
+ } else if (strncmp(url, "ftp://", 6) == 0) {
+ h->port = 21;
+ h->host = url + 6;
+ h->is_ftp = 1;
+ } else
+ bb_error_msg_and_die("not an http or ftp url: %s", url);
- *uri_host = url + 7;
+ sp = strchr(h->host, '/');
+ if (sp != NULL) {
+ *sp++ = '\0';
+ h->path = sp;
+ } else
+ h->path = bb_xstrdup("");
- cp = strchr(*uri_host, ':');
- sp = strchr(*uri_host, '/');
+ up = strrchr(h->host, '@');
+ if (up != NULL) {
+ h->user = h->host;
+ *up++ = '\0';
+ h->host = up;
+ } else
+ h->user = NULL;
- if (cp != NULL && (sp == NULL || cp < sp)) {
+ cp = strchr(h->host, ':');
+ if (cp != NULL) {
*cp++ = '\0';
- *uri_port = atoi(cp);
+ h->port = atoi(cp);
}
- if (sp != NULL) {
- *sp++ = '\0';
- *uri_path = sp;
- } else
- *uri_path = "";
}
FILE *open_socket(char *host, int port)
{
- struct sockaddr_in sin;
- struct hostent *hp;
int fd;
FILE *fp;
+ char port_str[10];
- 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);
+ snprintf(port_str, sizeof(port_str), "%d", port);
+ fd=xconnect(host, port_str);
/*
* 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()");
+ bb_perror_msg_and_die("fdopen()");
return fp;
}
/* 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)
return hdrval;
}
-#ifdef BB_FEATURE_WGET_STATUSBAR
+static int ftpcmd(char *s1, char *s2, FILE *fp, char *buf)
+{
+ char *p;
+
+ if (s1) {
+ 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);
+}
+
+#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;
return (80);
}
-void
+static void
updateprogressmeter(int ignore)
{
int save_errno = errno;
errno = save_errno;
}
-void
+static void
alarmtimer(int wait)
{
struct itimerval itv;
}
-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;
(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
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),
} else if (flag == 1) {
alarmtimer(0);
statbytes = 0;
+ putc('\n', stderr);
}
}
#endif
-/* Original copyright notice which applies to the BB_FEATURE_WGET_STATUSBAR stuff,
+/* Original copyright notice which applies to the CONFIG_FEATURE_WGET_STATUSBAR stuff,
* much of which was blatently stolen from openssh. */
/*-
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: wget.c,v 1.19 2001/01/24 17:37:07 andersen Exp $
+ * $Id: wget.c,v 1.54 2003/07/22 08:56:51 andersen Exp $
*/