*
*/
-#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"
-
-/* Stupid libc5 doesn't define this... */
-#ifndef timersub
-#define timersub(a, b, result) \
- do { \
- (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
- (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
- if ((result)->tv_usec < 0) { \
- --(result)->tv_sec; \
- (result)->tv_usec += 1000000; \
- } \
- } while (0)
-#endif
+#include <getopt.h> /* for struct option */
+
+#ifdef CONFIG_LFS
+# define FILEOFF_TYPE off64_t
+# define FILEOFF_FMT "%lld"
+# define LSEEK lseek64
+# define STRTOOFF strtoll
+# define SAFE_STRTOOFF safe_strtoll
+/* stat64 etc as needed... */
+#else
+# define FILEOFF_TYPE off_t
+# define FILEOFF_FMT "%ld"
+# define LSEEK lseek
+# define STRTOOFF strtol
+# define SAFE_STRTOOFF safe_strtol
+/* Do we need to undefine O_LARGEFILE? */
+#endif
struct host_info {
char *host;
};
static void parse_url(char *url, struct host_info *h);
-static FILE *open_socket(char *host, int port);
+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 */
-static int chunked = 0; /* chunked transfer encoding */
+static FILEOFF_TYPE content_len; /* Content-length of the file */
+static FILEOFF_TYPE beg_range; /* Range at which continue begins */
+static FILEOFF_TYPE transferred; /* Number of bytes transferred so far */
+static int chunked; /* 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. */
-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
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)
return ret;
}
-#define close_delete_and_die(s...) { \
- close_and_delete_outfile(output, fname_out, do_continue); \
- 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
+ * 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)
- 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
+#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
+#define WGET_OPT_USER_AGENT 128
+
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+static const struct option wget_long_options[] = {
+ { "continue", 0, NULL, 'c' },
+ { "quiet", 0, NULL, 'q' },
+ { "passive-ftp", 0, NULL, 139 }, /* FIXME: what is this - 139?? */
+ { "output-document", 1, NULL, 'O' },
+ { "header", 1, NULL, 131 },
+ { "directory-prefix",1, NULL, 'P' },
+ { "proxy", 1, NULL, 'Y' },
+ { "user-agent", 1, NULL, 'U' },
+ { 0, 0, 0, 0 }
+};
+#endif
+
int wget_main(int argc, char **argv)
{
int n, try=5, status;
+ unsigned opt;
int port;
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;
+ 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 got_clen = 0; /* got content-length: from server */
+ int output_fd = -1;
+ int use_proxy = 1; /* Use proxies if env vars are set */
+ char *proxy_flag = "on"; /* Use proxies if env vars are set */
+ 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
- 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' },
- { 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)
- 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;
- }
- }
- break;
- default:
- show_usage();
+ opt_complementary = "-1:\203::";
+#if ENABLE_FEATURE_WGET_LONG_OPTIONS
+ applet_long_options = wget_long_options;
+#endif
+ opt = getopt32(argc, argv, "cq\213O:\203:P:Y:U:",
+ &fname_out, &headers_llist,
+ &dir_prefix, &proxy_flag, &user_agent);
+ 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)
- show_usage();
-
parse_url(argv[optind], &target);
server.host = target.host;
server.port = target.port;
/*
* Use the proxy if necessary.
*/
- if (!noproxy) {
+ if (use_proxy) {
proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
- if (proxy)
+ if (proxy && *proxy) {
parse_url(xstrdup(proxy), &server);
+ } else {
+ use_proxy = 0;
+ }
}
-
+
/* Guess an output filename */
if (!fname_out) {
- 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 =
+ curfile =
#endif
- get_last_path_component(target.path);
- if (fname_out==NULL || strlen(fname_out)<1) {
- fname_out =
+ bb_get_last_path_component(target.path);
+ }
+ if (!fname_out || !fname_out[0]) {
+ fname_out =
#ifdef CONFIG_FEATURE_WGET_STATUSBAR
- curfile =
+ curfile =
#endif
"index.html";
}
fname_out = concat_path_file(dir_prefix, fname_out);
#ifdef CONFIG_FEATURE_WGET_STATUSBAR
} else {
- curfile = get_last_path_component(fname_out);
+ curfile = bb_get_last_path_component(fname_out);
#endif
}
- if (do_continue && !fname_out)
- error_msg_and_die("cannot specify continue (-c) without a filename (-O)");
-
+ 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 = xfopen(fname_out, (do_continue ? "a" : "w"));
+ if (!strcmp(fname_out, "-")) {
+ output_fd = 1;
+ opt |= WGET_OPT_QUIET;
+ opt &= ~WGET_OPT_CONTINUE;
+ } else if (opt & WGET_OPT_CONTINUE) {
+ output_fd = open(fname_out, O_WRONLY|O_LARGEFILE);
+ if (output_fd >= 0) {
+ beg_range = LSEEK(output_fd, 0, SEEK_END);
+ if (beg_range == (FILEOFF_TYPE)-1)
+ bb_perror_msg_and_die("lseek");
+ }
+ /* 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)
- 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... */
+ bb_lookup_host(&s_in, server.host);
+ s_in.sin_port = 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));
}
- if (proxy || !target.is_ftp) {
+ if (use_proxy || !target.is_ftp) {
/*
* HTTP session
*/
do {
- if (! --try)
- close_delete_and_die("too many redirections");
+ got_clen = chunked = 0;
+
+ 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(&s_in);
+
/*
* Send HTTP request.
*/
- if (proxy) {
- fprintf(sfp, "GET %stp://%s:%d/%s HTTP/1.1\r\n",
+ 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,
- target.port, target.path);
+ 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);
+ fprintf(sfp, "Host: %s\r\nUser-Agent: %s\r\n", target.host,
+ user_agent);
#ifdef CONFIG_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 (beg_range)
+ fprintf(sfp, "Range: bytes="FILEOFF_FMT"-\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");
-
+ * Retrieve HTTP response line and check for "200" status code.
+ */
+read_response:
+ if (fgets(buf, sizeof(buf), sfp) == NULL)
+ bb_error_msg_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 303:
break;
case 206:
- if (do_continue)
+ if (beg_range)
break;
/*FALLTHRU*/
default:
chomp(buf);
- close_delete_and_die("server returned error %d: %s", atoi(s), buf);
+ bb_error_msg_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);
+ if (SAFE_STRTOOFF(s, &content_len) || content_len < 0) {
+ bb_error_msg_and_die("content-length %s is garbage", s);
+ }
got_clen = 1;
continue;
}
if (strcasecmp(s, "chunked") == 0) {
chunked = got_clen = 1;
} else {
- close_delete_and_die("server wants to do %s transfer encoding", s);
+ bb_error_msg_and_die("server wants to do %s transfer encoding", s);
}
}
if (strcasecmp(buf, "location") == 0) {
target.path = xstrdup(s+1);
else {
parse_url(xstrdup(s), &target);
- if (!proxy) {
+ 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)
+ if (!target.user)
target.user = xstrdup("anonymous:busybox@");
- sfp = open_socket(server.host, server.port);
+ sfp = open_socket(&s_in);
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)) {
+ switch (ftpcmd("USER ", target.user, sfp, buf)) {
case 230:
break;
case 331:
break;
/* FALLTHRU (failed login) */
default:
- close_delete_and_die("ftp login: %s", buf+4);
+ 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) {
+ if (SAFE_STRTOOFF(buf+4, &content_len) || 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);
+ bb_error_msg_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;
+ s_in.sin_port = htons(port);
+ dfp = open_socket(&s_in);
+
+ if (beg_range) {
+ sprintf(buf, "REST "FILEOFF_FMT, 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("RETR: %s", buf+4);
}
*/
if (chunked) {
fgets(buf, sizeof(buf), dfp);
- filesize = strtol(buf, (char **) NULL, 16);
+ content_len = STRTOOFF(buf, (char **) 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 = xopen3(fname_out,
+ O_WRONLY|O_CREAT|O_EXCL|O_TRUNC|O_LARGEFILE, 0666);
+
+ if (!(opt & WGET_OPT_QUIET))
progressmeter(-1);
-#endif
+
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)
- 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;
+ transferred += n;
#endif
- if (got_clen)
- filesize -= n;
- }
+ if (got_clen) {
+ 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) chunked = 0; /* all done! */
+ content_len = STRTOOFF(buf, (char **) NULL, 16);
+ /* FIXME: error check? */
+ if (content_len == 0) {
+ chunked = 0; /* all done! */
+ }
}
- if (n == 0 && ferror(dfp))
- perror_msg_and_die("network read error");
+ if (n == 0 && ferror(dfp)) {
+ 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)
- error_msg_and_die("ftp error: %s", buf+4);
+ bb_error_msg_and_die("ftp error: %s", buf+4);
ftpcmd("QUIT", NULL, sfp, buf);
}
exit(EXIT_SUCCESS);
}
-void parse_url(char *url, struct host_info *h)
+static void parse_url(char *url, struct host_info *h)
{
- char *cp, *sp, *up;
+ char *cp, *sp, *up, *pp;
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", "tfp", 21);
h->host = url + 6;
h->is_ftp = 1;
} else
- error_msg_and_die("not an http or ftp url: %s", url);
+ bb_error_msg_and_die("not an http or ftp url: %s", url);
sp = strchr(h->host, '/');
- if (sp != NULL) {
+ if (sp) {
*sp++ = '\0';
h->path = sp;
} else
} else
h->user = NULL;
- cp = strchr(h->host, ':');
+ 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);
+ h->port = htons(atoi(cp));
}
-
}
-FILE *open_socket(char *host, int port)
+static FILE *open_socket(struct sockaddr_in *s_in)
{
- 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)
- perror_msg_and_die("fdopen()");
+ fp = fdopen(xconnect(s_in), "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;
/* verify we are at the end of the header name */
if (*s != ':')
- error_msg_and_die("bad header line: %s", 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)
static int ftpcmd(char *s1, char *s2, FILE *fp, char *buf)
{
- char *p;
-
if (s1) {
if (!s2) s2="";
- fprintf(fp, "%s%s\n", s1, s2);
+ fprintf(fp, "%s%s\r\n", s1, s2);
fflush(fp);
}
-
+
do {
- p = fgets(buf, 510, fp);
- if (!p)
- perror_msg_and_die("fgets()");
- } while (! isdigit(buf[0]) || buf[3] != ' ');
-
+ 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.
+/* 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=0;
+ get_terminal_width_height(0, &width, NULL);
+ return (width);
}
static void
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);
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;
+ static FILEOFF_TYPE lastsize, totalsize;
+
+ struct timeval now, td, tvwait;
+ FILEOFF_TYPE abbrevsize;
+ int elapsed, ratio, barlength, i;
char buf[256];
- if (flag == -1) {
+ if (flag == -1) { /* first call to progressmeter */
(void) 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;
+ ratio = 100;
if (totalsize != 0 && !chunked) {
- ratio = 100.0 * cursize / totalsize;
- ratio = MAX(ratio, 0);
+ ratio = (int) (100 * (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);
+ FILEOFF_TYPE 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) (to_download*elapsed/transferred - elapsed);
+ 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.
* 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
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: wget.c,v 1.50 2002/07/03 11:51:44 andersen Exp $
+ * $Id: wget.c,v 1.75 2004/10/08 08:27:40 andersen Exp $
*/
-
-
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
-
-
-