X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fwget.c;h=fdcc68df31ffcb5459e03af70e4445861c4770b8;hb=c44bc986b738977c5cd9741d9752a41ac022602f;hp=c92771e18d38389d47776b508c1c0696ab4dcdac;hpb=036dbaa082f1974246d1d7d21a8e163559642485;p=oweals%2Fbusybox.git diff --git a/networking/wget.c b/networking/wget.c index c92771e18..fdcc68df3 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -12,11 +12,11 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -24,9 +24,6 @@ #include #include -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif #include #include "busybox.h" @@ -55,7 +52,7 @@ static volatile unsigned long statbytes = 0; /* Number of bytes transferred so f /* 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) { @@ -117,26 +114,26 @@ static char *safe_fgets(char *s, int size, FILE *stream) /* * Base64-encode character string * oops... isn't something similar in uuencode.c? - * It would be better to use already existing code + * XXX: It would be better to use already existing code */ -char *base64enc(char *p, char *buf, int len) { +static char *base64enc(unsigned char *p, char *buf, int len) { - char al[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" - "0123456789+/"; + char al[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" + "0123456789+/"; char *s = buf; - while(*p) { + 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]; - } + *(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; } @@ -177,34 +174,34 @@ int wget_main(int argc, char **argv) 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 noproxy = 0; /* Use proxies if env vars are set */ + 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. */ - bb_opt_complementaly = "\203*"; + bb_opt_complementally = "-1:\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); + 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, "on") == 0) { + if (strcmp(proxy_flag, "off") == 0) { /* Use the proxy if necessary. */ - proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy"); - if (proxy) - parse_url(bb_xstrdup(proxy), &server); + use_proxy = 0; } if (opt & WGET_OPT_HEADER) { while (headers_llist) { @@ -220,8 +217,6 @@ int wget_main(int argc, char **argv) headers_llist = headers_llist->link; } } - if (argc - optind != 1) - bb_show_usage(); parse_url(argv[optind], &target); server.host = target.host; @@ -230,23 +225,30 @@ int wget_main(int argc, char **argv) /* * 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(bb_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 - bb_get_last_path_component(target.path); + bb_get_last_path_component(target.path); + } if (fname_out==NULL || strlen(fname_out)<1) { - fname_out = + fname_out = #ifdef CONFIG_FEATURE_WGET_STATUSBAR - curfile = + curfile = #endif "index.html"; } @@ -293,7 +295,7 @@ int wget_main(int argc, char **argv) server.host, inet_ntoa(s_in.sin_addr), ntohs(server.port)); } - if (proxy || !target.is_ftp) { + if (use_proxy || !target.is_ftp) { /* * HTTP session */ @@ -308,11 +310,11 @@ int wget_main(int argc, char **argv) */ if (sfp) fclose(sfp); sfp = open_socket(&s_in); - + /* * Send HTTP request. */ - if (proxy) { + 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, ':')) @@ -320,7 +322,7 @@ int wget_main(int argc, char **argv) #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); } @@ -330,11 +332,11 @@ int wget_main(int argc, char **argv) #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 @@ -345,12 +347,12 @@ int wget_main(int argc, char **argv) fprintf(sfp,"Connection: close\r\n\r\n"); /* - * Retrieve HTTP response line and check for "200" status code. - */ + * 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) @@ -378,13 +380,17 @@ read_response: 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); + unsigned long value; + if (safe_strtoul(s, &value)) { + close_delete_and_die("content-length %s is garbage", s); + } + filesize = value; got_clen = 1; continue; } @@ -400,15 +406,18 @@ read_response: target.path = bb_xstrdup(s+1); else { parse_url(bb_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 @@ -423,7 +432,7 @@ read_response: if (ftpcmd(NULL, NULL, sfp, buf) != 220) close_delete_and_die("%s", buf+4); - /* + /* * Splitting username:password pair, * trying to log in */ @@ -440,18 +449,22 @@ read_response: 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); + unsigned long value; + if (safe_strtoul(buf+4, &value)) { + close_delete_and_die("SIZE value is garbage"); + } + filesize = value; got_clen = 1; } - + /* * Entering passive mode */ @@ -474,7 +487,7 @@ read_response: } else filesize -= beg_range; } - + if (ftpcmd("RETR /", target.path, sfp, buf) > 150) close_delete_and_die("RETR: %s", buf+4); @@ -522,7 +535,7 @@ read_response: if (quiet_flag==FALSE) progressmeter(1); #endif - if (!proxy && target.is_ftp) { + 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); @@ -548,7 +561,7 @@ void parse_url(char *url, struct host_info *h) 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 @@ -648,28 +661,32 @@ char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc) 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) + 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 @@ -782,7 +799,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; @@ -800,8 +817,8 @@ progressmeter(int flag) #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. @@ -815,8 +832,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. + * 3. * * 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 @@ -834,15 +851,5 @@ progressmeter(int flag) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: wget.c,v 1.65 2004/01/17 05:03:31 bug1 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: -*/