/* We want libc to give us xxx64 functions also */
/* http://www.unix.org/version2/whatsnew/lfs20mar.html */
-#define _LARGEFILE64_SOURCE 1
+//#define _LARGEFILE64_SOURCE 1
-#include "busybox.h"
#include <getopt.h> /* for struct option */
+#include "libbb.h"
struct host_info {
// May be used if we ever will want to free() all xstrdup()s...
};
static void parse_url(char *url, struct host_info *h);
-static FILE *open_socket(struct sockaddr_in *s_in);
+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);
+static int ftpcmd(const char *s1, const char *s2, FILE *fp, char *buf);
/* Globals (can be accessed from signal handlers */
static off_t content_len; /* Content-length of the file */
static off_t beg_range; /* Range at which continue begins */
-#ifdef CONFIG_FEATURE_WGET_STATUSBAR
+#if ENABLE_FEATURE_WGET_STATUSBAR
static off_t transferred; /* Number of bytes transferred so far */
#endif
-static int chunked; /* chunked transfer encoding */
-#ifdef CONFIG_FEATURE_WGET_STATUSBAR
+static bool 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 const char *curfile; /* Name of current file being transferred */
enum {
STALLTIME = 5 /* Seconds when xfer considered "stalled" */
};
#else
-static void progressmeter(int flag) {}
+static ALWAYS_INLINE void progressmeter(int flag) {}
#endif
-/* 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)
+/* Read NMEMB bytes into PTR from STREAM. Returns the number of bytes read,
+ * and a short count if an eof or non-interrupt error is encountered. */
+static size_t safe_fread(void *ptr, size_t nmemb, FILE *stream)
{
- size_t ret = 0;
+ size_t ret;
+ char *p = (char*)ptr;
do {
clearerr(stream);
- ret += fread((char *)ptr + (ret * size), size, nmemb - ret, stream);
- } while (ret < nmemb && ferror(stream) && errno == EINTR);
+ ret = fread(p, 1, nmemb, stream);
+ p += ret;
+ nmemb -= ret;
+ } while (nmemb && ferror(stream) && errno == EINTR);
- return ret;
+ return p - (char*)ptr;
}
-/* Read a line or SIZE - 1 bytes into S, whichever is less, from STREAM.
+/* 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)
{
return ret;
}
-#ifdef CONFIG_FEATURE_WGET_AUTHENTICATION
-/*
- * Base64-encode character string and return the string.
- */
-static char *base64enc(unsigned char *p, char *buf, int len)
+#if ENABLE_FEATURE_WGET_AUTHENTICATION
+/* Base64-encode character string. buf is assumed to be char buf[512]. */
+static char *base64enc_512(char buf[512], const char *str)
{
- bb_uuencode(p, buf, len, bb_uuenc_tbl_base64);
+ unsigned len = strlen(str);
+ if (len > 512/4*3 - 10) /* paranoia */
+ len = 512/4*3 - 10;
+ bb_uuencode(buf, str, len, bb_uuenc_tbl_base64);
return buf;
}
#endif
+int wget_main(int argc, char **argv);
int wget_main(int argc, char **argv)
{
char buf[512];
struct host_info server, target;
- struct sockaddr_in s_in;
+ len_and_sockaddr *lsa;
int n, status;
int port;
int try = 5;
unsigned opt;
- char *s;
+ char *str;
char *proxy = 0;
char *dir_prefix = NULL;
#if ENABLE_FEATURE_WGET_LONG_OPTIONS
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 */
+ bool got_clen = 0; /* got content-length: from server */
int output_fd = -1;
- int use_proxy = 1; /* Use proxies if env vars are set */
+ bool 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 */
-
- /*
- * Crack command line.
- */
+ const char *user_agent = "Wget";/* "User-Agent" header field */
+ static const char keywords[] =
+ "content-length\0""transfer-encoding\0""chunked\0""location\0";
+ enum {
+ KEY_content_length = 1, KEY_transfer_encoding, KEY_chunked, KEY_location
+ };
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,
+ WGET_OPT_SPIDER = 0x2,
+ WGET_OPT_QUIET = 0x4,
+ WGET_OPT_OUTNAME = 0x8,
+ WGET_OPT_PREFIX = 0x10,
+ WGET_OPT_PROXY = 0x20,
+ WGET_OPT_USER_AGENT = 0x40,
+ WGET_OPT_PASSIVE = 0x80,
+ WGET_OPT_HEADER = 0x100,
};
#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;
+ static const char wget_longopts[] =
+ /* name, has_arg, val */
+ "continue\0" No_argument "c"
+ "spider\0" No_argument "s"
+ "quiet\0" No_argument "q"
+ "output-document\0" Required_argument "O"
+ "directory-prefix\0" Required_argument "P"
+ "proxy\0" Required_argument "Y"
+ "user-agent\0" Required_argument "U"
+ "passive-ftp\0" No_argument "\xff"
+ "header\0" Required_argument "\xfe"
+ ;
+ applet_long_options = wget_longopts;
#endif
+ /* server.allocated = target.allocated = NULL; */
opt_complementary = "-1" USE_FEATURE_WGET_LONG_OPTIONS(":\xfe::");
- opt = getopt32(argc, argv, "cqO:P:Y:U:",
+ opt = getopt32(argc, argv, "csqO: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 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);
+ llist_t *ll = headers_llist;
while (ll) {
size += strlen(ll->data) + 2;
ll = ll->link;
server.host = target.host;
server.port = target.port;
- /*
- * Use the proxy if necessary.
- */
+ /* Use the proxy if necessary */
if (use_proxy) {
proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
if (proxy && *proxy) {
if (!fname_out) {
// Dirty hack. Needed because bb_get_last_path_component
// will destroy trailing / by storing '\0' in last byte!
- if (*target.path && target.path[strlen(target.path)-1] != '/') {
- fname_out =
-#ifdef CONFIG_FEATURE_WGET_STATUSBAR
- curfile =
+ if (!last_char_is(target.path, '/')) {
+ fname_out = bb_get_last_path_component(target.path);
+#if ENABLE_FEATURE_WGET_STATUSBAR
+ curfile = fname_out;
#endif
- bb_get_last_path_component(target.path);
}
if (!fname_out || !fname_out[0]) {
- fname_out =
-#ifdef CONFIG_FEATURE_WGET_STATUSBAR
- curfile =
+ /* bb_get_last_path_component writes
+ * to last '/' only. We don't have one here... */
+ fname_out = (char*)"index.html";
+#if ENABLE_FEATURE_WGET_STATUSBAR
+ curfile = fname_out;
#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
}
+ /* Impossible?
if ((opt & WGET_OPT_CONTINUE) && !fname_out)
- bb_error_msg_and_die("cannot specify continue (-c) without a filename (-O)");
+ bb_error_msg_and_die("cannot specify continue (-c) without a filename (-O)"); */
- /*
- * Determine where to start transfer.
- */
- if (!strcmp(fname_out, "-")) {
+ /* Determine where to start transfer */
+ if (LONE_DASH(fname_out)) {
output_fd = 1;
- opt |= WGET_OPT_QUIET;
opt &= ~WGET_OPT_CONTINUE;
- } else if (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);
/* 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;
+ lsa = xhost2sockaddr(server.host, server.port);
if (!(opt & WGET_OPT_QUIET)) {
- printf("Connecting to %s[%s]:%d\n",
- server.host, inet_ntoa(s_in.sin_addr), ntohs(server.port));
+ fprintf(stderr, "Connecting to %s (%s)\n", server.host,
+ xmalloc_sockaddr2dotted(&lsa->sa, lsa->len));
+ /* We leak result of xmalloc_sockaddr2dotted */
}
if (use_proxy || !target.is_ftp) {
if (!--try)
bb_error_msg_and_die("too many redirections");
- /*
- * Open socket to http server
- */
+ /* Open socket to http server */
if (sfp) fclose(sfp);
- sfp = open_socket(&s_in);
+ sfp = open_socket(lsa);
- /*
- * Send HTTP request.
- */
+ /* 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,
+ fprintf(sfp, "GET %stp://%s/%s HTTP/1.1\r\n",
target.is_ftp ? "f" : "ht", target.host,
- ntohs(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: %s\r\n", target.host,
- user_agent);
+ 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((unsigned char*)target.user, buf, sizeof(buf)));
+ fprintf(sfp, "Proxy-Authorization: Basic %s\r\n"+6,
+ base64enc_512(buf, target.user));
}
if (use_proxy && server.user) {
fprintf(sfp, "Proxy-Authorization: Basic %s\r\n",
- base64enc((unsigned char*)server.user, buf, sizeof(buf)));
+ base64enc_512(buf, server.user));
}
#endif
if (beg_range)
- fprintf(sfp, "Range: bytes="OFF_FMT"-\r\n", 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);
if (fgets(buf, sizeof(buf), sfp) == NULL)
bb_error_msg_and_die("no response from server");
- s = buf;
- while (*s != '\0' && !isspace(*s)) ++s;
- s = skip_whitespace(s);
+ str = buf;
+ str = skip_non_whitespace(str);
+ str = skip_whitespace(str);
// FIXME: no error check
// xatou wouldn't work: "200 OK"
- status = atoi(s);
+ status = atoi(str);
switch (status) {
case 0:
case 100:
break;
/*FALLTHRU*/
default:
- chomp(buf);
- bb_error_msg_and_die("server returned error %s: %s", s, buf);
+ /* 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) {
- if (SAFE_STRTOOFF(s, &content_len) || content_len < 0) {
- bb_error_msg_and_die("content-length %s is garbage", s);
+ while ((str = gethdr(buf, sizeof(buf), sfp, &n)) != NULL) {
+ /* gethdr did already convert the "FOO:" string to lowercase */
+ smalluint key = index_in_strings(keywords, *&buf) + 1;
+ if (key == KEY_content_length) {
+ content_len = BB_STRTOOFF(str, NULL, 10);
+ if (errno || content_len < 0) {
+ bb_error_msg_and_die("content-length %s is garbage", str);
}
got_clen = 1;
continue;
}
- if (strcasecmp(buf, "transfer-encoding") == 0) {
- if (strcasecmp(s, "chunked") != 0)
- bb_error_msg_and_die("server wants to do %s transfer encoding", s);
+ if (key == KEY_transfer_encoding) {
+ if (index_in_strings(keywords, str_tolower(str)) + 1 != KEY_chunked)
+ bb_error_msg_and_die("server wants to do %s transfer encoding", str);
chunked = got_clen = 1;
}
- if (strcasecmp(buf, "location") == 0) {
- if (s[0] == '/')
+ if (key == KEY_location) {
+ if (str[0] == '/')
/* free(target.allocated); */
- target.path = /* target.allocated = */ xstrdup(s+1);
+ target.path = /* target.allocated = */ xstrdup(str+1);
else {
- parse_url(s, &target);
+ parse_url(str, &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;
+ free(lsa);
+ lsa = xhost2sockaddr(server.host, server.port);
break;
}
}
}
- } while(status >= 300);
+ } while (status >= 300);
dfp = sfp;
if (!target.user)
target.user = xstrdup("anonymous:busybox@");
- sfp = open_socket(&s_in);
+ sfp = open_socket(lsa);
if (ftpcmd(NULL, NULL, sfp, buf) != 220)
bb_error_msg_and_die("%s", buf+4);
* Splitting username:password pair,
* trying to log in
*/
- s = strchr(target.user, ':');
- if (s)
- *(s++) = '\0';
+ str = strchr(target.user, ':');
+ if (str)
+ *(str++) = '\0';
switch (ftpcmd("USER ", target.user, sfp, buf)) {
case 230:
break;
case 331:
- if (ftpcmd("PASS ", s, sfp, buf) == 230)
+ if (ftpcmd("PASS ", str, sfp, buf) == 230)
break;
/* FALLTHRU (failed login) */
default:
* Querying file size
*/
if (ftpcmd("SIZE ", target.path, sfp, buf) == 213) {
- if (SAFE_STRTOOFF(buf+4, &content_len) || content_len < 0) {
+ 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;
pasv_error:
bb_error_msg_and_die("bad response to %s: %s", "PASV", buf);
}
- // Response is "227 garbageN1,N2,N3,N4,P1,P2
+ // 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) goto pasv_error;
- port = xatol_range(s+1, 0, 255);
- *s = '\0';
- s = strrchr(buf, ',');
- if (!s) goto pasv_error;
- port += xatol_range(s+1, 0, 255) * 256;
- s_in.sin_port = htons(port);
- dfp = open_socket(&s_in);
+ str = strrchr(buf, ')');
+ if (str) str[0] = '\0';
+ str = strrchr(buf, ',');
+ if (!str) goto pasv_error;
+ port = xatou_range(str+1, 0, 255);
+ *str = '\0';
+ str = strrchr(buf, ',');
+ if (!str) goto pasv_error;
+ port += xatou_range(str+1, 0, 255) * 256;
+ set_nport(lsa, htons(port));
+ dfp = open_socket(lsa);
if (beg_range) {
- sprintf(buf, "REST "OFF_FMT, 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)
- bb_error_msg_and_die("bad response to %s: %s", "RETR", buf);
+ bb_error_msg_and_die("bad response to RETR: %s", buf);
+ }
+ if (opt & WGET_OPT_SPIDER) {
+ if (ENABLE_FEATURE_CLEAN_UP)
+ fclose(sfp);
+ goto done;
}
-
/*
* Retrieve file
*/
if (chunked) {
fgets(buf, sizeof(buf), dfp);
- content_len = STRTOOFF(buf, (char **) NULL, 16);
+ content_len = STRTOOFF(buf, NULL, 16);
/* FIXME: error check?? */
}
/* Do it before progressmeter (want to have nice error message) */
if (output_fd < 0)
- output_fd = xopen3(fname_out,
- O_WRONLY|O_CREAT|O_EXCL|O_TRUNC, 0666);
+ output_fd = xopen(fname_out,
+ O_WRONLY|O_CREAT|O_EXCL|O_TRUNC);
if (!(opt & WGET_OPT_QUIET))
progressmeter(-1);
unsigned rdsz = sizeof(buf);
if (content_len < sizeof(buf) && (chunked || got_clen))
rdsz = (unsigned)content_len;
- n = safe_fread(buf, 1, rdsz, dfp);
+ n = safe_fread(buf, 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
+#if ENABLE_FEATURE_WGET_STATUSBAR
transferred += n;
#endif
if (got_clen) {
if (chunked) {
safe_fgets(buf, sizeof(buf), dfp); /* This is a newline */
safe_fgets(buf, sizeof(buf), dfp);
- content_len = STRTOOFF(buf, (char **) NULL, 16);
+ content_len = STRTOOFF(buf, NULL, 16);
/* FIXME: error check? */
if (content_len == 0) {
chunked = 0; /* all done! */
bb_error_msg_and_die("ftp error: %s", buf+4);
ftpcmd("QUIT", NULL, sfp, buf);
}
+done:
exit(EXIT_SUCCESS);
}
static void parse_url(char *src_url, struct host_info *h)
{
- char *url, *p, *cp, *sp, *up, *pp;
+ char *url, *p, *sp;
/* h->allocated = */ url = xstrdup(src_url);
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 = "";
+ /* must be writable because of bb_get_last_path_component() */
+ static char nullstr[] = "";
+ h->path = nullstr;
} else if (*sp == '/') {
- *sp++ = '\0';
- h->path = sp;
+ *sp = '\0';
+ h->path = sp + 1;
} else { // '#' or '?'
// http://busybox.net?login=john@doe is a valid URL
// memmove converts to:
h->path = sp;
}
- up = strrchr(h->host, '@');
- if (up != NULL) {
+ sp = strrchr(h->host, '@');
+ h->user = NULL;
+ if (sp != 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;
- }
+ *sp = '\0';
+ h->host = sp + 1;
}
-#endif
- cp = strchr(pp, ':');
- if (cp != NULL) {
- *cp++ = '\0';
- h->port = htons(xatou16(cp));
- }
+ sp = h->host;
}
-static FILE *open_socket(struct sockaddr_in *s_in)
+static FILE *open_socket(len_and_sockaddr *lsa)
{
FILE *fp;
- fp = fdopen(xconnect_tcp_v4(s_in), "r+");
+ /* 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 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 */
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;
return hdrval;
}
-static int ftpcmd(char *s1, char *s2, FILE *fp, char *buf)
+static int ftpcmd(const char *s1, const char *s2, FILE *fp, char *buf)
{
int result;
if (s1) {
return result;
}
-#ifdef CONFIG_FEATURE_WGET_STATUSBAR
+#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)
{
- int width=0;
+ int width;
get_terminal_width_height(0, &width, NULL);
return width;
}
setitimer(ITIMER_REAL, &itv, NULL);
}
-
static void
progressmeter(int flag)
{
- static struct timeval lastupdate;
+ static unsigned lastupdate_sec;
+ static unsigned start_sec;
static off_t lastsize, totalsize;
- struct timeval now, td, tvwait;
off_t abbrevsize;
- int elapsed, ratio, barlength, i;
- char buf[256];
+ unsigned since_last_update, elapsed;
+ unsigned ratio;
+ int barlength, i;
if (flag == -1) { /* first call to progressmeter */
- (void) gettimeofday(&start, (struct timezone *) 0);
- lastupdate = start;
+ start_sec = monotonic_sec();
+ lastupdate_sec = start_sec;
lastsize = 0;
totalsize = content_len + beg_range; /* as content_len changes.. */
}
- (void) gettimeofday(&now, (struct timezone *) 0);
ratio = 100;
if (totalsize != 0 && !chunked) {
- ratio = (int) (100 * (transferred+beg_range) / totalsize);
- ratio = MIN(ratio, 100);
+ /* long long helps to have it working even if !LFS */
+ ratio = (unsigned) (100ULL * (transferred+beg_range) / totalsize);
+ if (ratio > 100) ratio = 100;
}
fprintf(stderr, "\r%-20.20s%4d%% ", curfile, ratio);
- barlength = getttywidth() - 51;
- if (barlength > 0 && barlength < sizeof(buf)) {
+ barlength = getttywidth() - 49;
+ if (barlength > 0) {
+ /* god bless gcc for variable arrays :) */
i = barlength * ratio / 100;
- memset(buf, '*', i);
- memset(buf + i, ' ', barlength - i);
- buf[barlength] = '\0';
- fprintf(stderr, "|%s|", buf);
+ {
+ char buf[i+1];
+ memset(buf, '*', i);
+ buf[i] = '\0';
+ fprintf(stderr, "|%s%*s|", buf, barlength - i, "");
+ }
}
i = 0;
abbrevsize = transferred + beg_range;
i++;
abbrevsize >>= 10;
}
- /* See http://en.wikipedia.org/wiki/Tera */
- fprintf(stderr, "%6d %c%c ", (int)abbrevsize, " KMGTPEZY"[i], i?'B':' ');
+ /* see http://en.wikipedia.org/wiki/Tera */
+ fprintf(stderr, "%6d%c ", (int)abbrevsize, " kMGTPEZY"[i]);
+
+// Nuts! Ain't it easier to update progress meter ONLY when we transferred++?
+// FIXME: get rid of alarmtimer + updateprogressmeter mess
- timersub(&now, &lastupdate, &tvwait);
+ elapsed = monotonic_sec();
+ since_last_update = elapsed - lastupdate_sec;
if (transferred > lastsize) {
- lastupdate = now;
+ lastupdate_sec = elapsed;
lastsize = transferred;
- if (tvwait.tv_sec >= STALLTIME)
- timeradd(&start, &tvwait, &start);
- tvwait.tv_sec = 0;
+ if (since_last_update >= STALLTIME) {
+ /* We "cut off" these seconds from elapsed time
+ * by adjusting start time */
+ start_sec += since_last_update;
+ }
+ since_last_update = 0; /* we are un-stalled now */
}
- timersub(&now, &start, &td);
- elapsed = td.tv_sec;
+ elapsed -= start_sec; /* now it's "elapsed since start" */
- if (tvwait.tv_sec >= STALLTIME) {
+ if (since_last_update >= STALLTIME) {
fprintf(stderr, " - stalled -");
} else {
off_t to_download = totalsize - beg_range;
- if (transferred <= 0 || elapsed <= 0 || transferred > to_download || chunked) {
+ if (transferred <= 0 || (int)elapsed <= 0 || transferred > to_download || chunked) {
fprintf(stderr, "--:--:-- ETA");
} else {
/* to_download / (transferred/elapsed) - elapsed: */
- int eta = (int) (to_download*elapsed/transferred - 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);
}
putc('\n', stderr);
}
}
-#endif
+#endif /* FEATURE_WGET_STATUSBAR */
/* Original copyright notice which applies to the CONFIG_FEATURE_WGET_STATUSBAR stuff,
* much of which was blatantly stolen from openssh. */
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: wget.c,v 1.75 2004/10/08 08:27:40 andersen Exp $
*/
projects / oweals / busybox.git / blobdiff