X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=networking%2Fwget.c;h=d1aacefa605318ad5d3f8ab2926f1cc3c4485bb4;hb=f1bbb22dca4d39aa227246f4c2ee90acd7e512a4;hp=78db6e32a153c13c2c9aa44377b06da9cc63c26a;hpb=4e573f4729a2a6e2aeba56fcfc8ed4c1d41e83e9;p=oweals%2Fbusybox.git diff --git a/networking/wget.c b/networking/wget.c index 78db6e32a..d1aacefa6 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -16,6 +16,7 @@ #include "busybox.h" #include +#include #include #include #include @@ -32,6 +33,18 @@ #include #include +/* 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 void parse_url(char *url, char **uri_host, int *uri_port, char **uri_path); FILE *open_socket(char *host, int port); @@ -40,91 +53,131 @@ void progressmeter(int flag); /* Globals (can be accessed from signal handlers */ static off_t filesize = 0; /* content-length of the file */ -#ifdef BB_FEATURE_STATUSBAR +#ifdef BB_FEATURE_WGET_STATUSBAR 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. */ /* For progressmeter() -- number of seconds before xfer considered "stalled" */ -#define STALLTIME 5 +static const int STALLTIME = 5; #endif + +void close_and_delete_outfile(FILE* output, char *fname_out, int do_continue) +{ + if (output != stdout && do_continue==0) { + fclose(output); + unlink(fname_out); + } +} int wget_main(int argc, char **argv) { - FILE *sfp; /* socket to web server */ - char *uri_host, *uri_path; /* parsed from command line url */ - int uri_port; - char *s, buf[512]; int n; + char *proxy, *proxy_host; + int uri_port, proxy_port; + char *s, buf[512]; + struct stat sbuf; + FILE *sfp; /* socket to web server */ + char *uri_host, *uri_path; /* parsed from command line url */ 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 */ + FILE *output; /* socket to web server */ + int quiet_flag = FALSE; /* Be verry, verry quiet... */ /* * Crack command line. */ - while ((n = getopt(argc, argv, "cO:")) != EOF) { + while ((n = getopt(argc, argv, "cqO:")) != EOF) { switch (n) { case 'c': ++do_continue; break; + case 'q': + quiet_flag = TRUE; + break; case 'O': - fname_out = (strcmp(optarg, "-") == 0 ? NULL : optarg); + /* 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); + show_usage(); } } if (argc - optind != 1) - usage(wget_usage); + show_usage(); + /* + * 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; + } + /* Guess an output filename */ if (!fname_out) { fname_out = -#ifdef BB_FEATURE_STATUSBAR +#ifdef BB_FEATURE_WGET_STATUSBAR curfile = #endif - get_last_path_component(argv[optind]); -#ifdef BB_FEATURE_STATUSBAR + get_last_path_component(uri_path); + if (fname_out==NULL || strlen(fname_out)<1) { + fname_out = +#ifdef BB_FEATURE_WGET_STATUSBAR + curfile = +#endif + "index.html"; + } +#ifdef BB_FEATURE_WGET_STATUSBAR } else { curfile=argv[optind]; #endif } - - if (do_continue && !fname_out) - fatalError("cannot specify continue (-c) without a filename (-O)\n"); - /* - * Parse url into components. - */ - parse_url(argv[optind], &uri_host, &uri_port, &uri_path); + error_msg_and_die("cannot specify continue (-c) without a filename (-O)"); + /* * Open socket to server. */ - sfp = open_socket(uri_host, uri_port); + 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 stream. + * Open the output file stream. */ - if (fname_out != NULL) { - if ( (output=fopen(fname_out, (do_continue ? "a" : "w"))) - == NULL) - fatalPerror("fopen(%s)", fname_out); - } else { - output=stdout; + if (fname_out != (char *)1) { + output = xfopen( fname_out, (do_continue ? "a" : "w") ); + } else { + output = stdout; } /* * Determine where to start transfer. */ if (do_continue) { - struct stat sbuf; if (fstat(fileno(output), &sbuf) < 0) - fatalError("fstat()"); + perror_msg_and_die("fstat()"); if (sbuf.st_size > 0) beg_range = sbuf.st_size; else @@ -134,44 +187,51 @@ int wget_main(int argc, char **argv) /* * Send HTTP request. */ - fprintf(sfp, "GET %s HTTP/1.1\r\nHost: %s\r\n", uri_path, uri_host); + 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); - fputs("Connection: close\r\n\r\n", sfp); + 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) - fatalError("no response from server\n"); + if (fgets(buf, sizeof(buf), sfp) == NULL) { + close_and_delete_outfile(output, fname_out, do_continue); + error_msg_and_die("no response from server"); + } for (s = buf ; *s != '\0' && !isspace(*s) ; ++s) ; for ( ; isspace(*s) ; ++s) ; switch (atoi(s)) { + case 0: case 200: - if (!do_continue) - break; - fatalError("server does not support ranges\n"); + break; case 206: if (do_continue) break; /*FALLTHRU*/ default: - fatalError("server returned error: %s", buf); + close_and_delete_outfile(output, fname_out, do_continue); + chomp(buf); + 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 (strcmp(buf, "content-length") == 0) { + if (strcasecmp(buf, "content-length") == 0) { filesize = atol(s); got_clen = 1; continue; } - if (strcmp(buf, "transfer-encoding") == 0) { - fatalError("server wants to do %s transfer encoding\n", s); + if (strcasecmp(buf, "transfer-encoding") == 0) { + close_and_delete_outfile(output, fname_out, do_continue); + error_msg_and_die("server wants to do %s transfer encoding", s); continue; } } @@ -179,21 +239,23 @@ int wget_main(int argc, char **argv) /* * Retrieve HTTP body. */ -#ifdef BB_FEATURE_STATUSBAR +#ifdef BB_FEATURE_WGET_STATUSBAR statbytes=0; - progressmeter(-1); + 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_STATUSBAR +#ifdef BB_FEATURE_WGET_STATUSBAR statbytes+=n; - progressmeter(1); + if (quiet_flag==FALSE) + progressmeter(1); #endif if (got_clen) filesize -= n; } if (n == 0 && ferror(sfp)) - fatalPerror("network read error"); + perror_msg_and_die("network read error"); exit(0); } @@ -201,26 +263,28 @@ int wget_main(int argc, char **argv) void parse_url(char *url, char **uri_host, int *uri_port, char **uri_path) { - char *s, *h; + char *cp, *sp; *uri_port = 80; if (strncmp(url, "http://", 7) != 0) - fatalError("not an http url: %s\n", url); - - /* pull the host portion to the front of the buffer */ - for (s = url, h = url+7 ; *h != '/' ; ++h) { - if (*h == '\0') - fatalError("cannot parse url: %s\n", url); - if (*h == ':') { - *uri_port = atoi(h+1); - *h = '\0'; - } - *s++ = *h; + error_msg_and_die("not an http url: %s", url); + + *uri_host = url + 7; + + cp = strchr(*uri_host, ':'); + sp = strchr(*uri_host, '/'); + + if (cp != NULL && (sp == NULL || cp < sp)) { + *cp++ = '\0'; + *uri_port = atoi(cp); } - *s = '\0'; - *uri_host = url; - *uri_path = h; + + if (sp != NULL) { + *sp++ = '\0'; + *uri_path = sp; + } else + *uri_path = ""; } @@ -231,10 +295,10 @@ FILE *open_socket(char *host, int port) int fd; FILE *fp; - memzero(&sin, sizeof(sin)); + memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; if ((hp = (struct hostent *) gethostbyname(host)) == NULL) - fatalError("cannot resolve %s\n", host); + error_msg_and_die("cannot resolve %s", host); memcpy(&sin.sin_addr, hp->h_addr_list[0], hp->h_length); sin.sin_port = htons(port); @@ -242,11 +306,11 @@ FILE *open_socket(char *host, int port) * Get the server onto a stdio stream. */ if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) - fatalPerror("socket()"); + perror_msg_and_die("socket()"); if (connect(fd, (struct sockaddr *) &sin, sizeof(sin)) < 0) - fatalPerror("connect(%s)", host); + perror_msg_and_die("connect(%s)", host); if ((fp = fdopen(fd, "r+")) == NULL) - fatalPerror("fdopen()"); + perror_msg_and_die("fdopen()"); return fp; } @@ -275,7 +339,7 @@ char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc) /* verify we are at the end of the header name */ if (*s != ':') - fatalError("bad header line: %s\n", buf); + error_msg_and_die("bad header line: %s", buf); /* locate the start of the header value */ for (*s++ = '\0' ; *s == ' ' || *s == '\t' ; ++s) @@ -299,7 +363,7 @@ char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc) return hdrval; } -#ifdef BB_FEATURE_STATUSBAR +#ifdef BB_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. * @@ -418,7 +482,7 @@ progressmeter(int flag) snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%02d:%02d ETA", i / 60, i % 60); } - write(fileno(stdout), buf, strlen(buf)); + write(fileno(stderr), buf, strlen(buf)); if (flag == -1) { struct sigaction sa; @@ -434,7 +498,7 @@ progressmeter(int flag) } #endif -/* Original copyright notice which applies to the BB_FEATURE_STATUSBAR stuff, +/* Original copyright notice which applies to the BB_FEATURE_WGET_STATUSBAR stuff, * much of which was blatently stolen from openssh. */ /*- @@ -469,7 +533,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.7 2000/11/14 23:29:24 andersen Exp $ + * $Id: wget.c,v 1.27 2001/02/14 21:23:06 andersen Exp $ */