emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for -Y|--proxy=on/off to wget

Browse Source
This commit is contained in:
Robert Griebl 2002-05-14 23:36:45 +00:00
parent 64f70cc755
commit d77601178d
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/usage.h
View File

@ -1960,14 +1960,15 @@
" 31 46 1365 /etc/passwd\n" " 31 46 1365 /etc/passwd\n"
#define wget_trivial_usage \ #define wget_trivial_usage \
"[-c|--continue] [-q|--quiet] [-O|--output-document file]\n\t[--header 'header: value'] [-P DIR] url" "[-c|--continue] [-q|--quiet] [-O|--output-document file]\n\t[--header 'header: value'] [-Y|--proxy on/off] [-P DIR] url"
#define wget_full_usage \ #define wget_full_usage \
"wget retrieves files via HTTP or FTP\n\n" \ "wget retrieves files via HTTP or FTP\n\n" \
"Options:\n" \ "Options:\n" \
"\t-c\tcontinue retrieval of aborted transfers\n" \ "\t-c\tcontinue retrieval of aborted transfers\n" \
"\t-q\tquiet mode - do not print\n" \ "\t-q\tquiet mode - do not print\n" \
"\t-P\tSet directory prefix to DIR\n" \ "\t-P\tSet directory prefix to DIR\n" \
"\t-O\tsave to filename ('-' for stdout)" "\t-O\tsave to filename ('-' for stdout)\n" \
"\t-Y\tuse proxy ('on' or 'off')"
#define which_trivial_usage \ #define which_trivial_usage \
"[COMMAND ...]" "[COMMAND ...]"

20
networking/wget.c
View File

@ -159,7 +159,7 @@ int wget_main(int argc, char **argv)
{ {
int n, try=5, status; int n, try=5, status;
int port; int port;
char *proxy; char *proxy = 0;
char *dir_prefix=NULL; char *dir_prefix=NULL;
char *s, buf[512]; char *s, buf[512];
struct stat sbuf; struct stat sbuf;
@ -177,6 +177,7 @@ int wget_main(int argc, char **argv)
int got_clen = 0; /* got content-length: from server */ 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... */ int quiet_flag = FALSE; /* Be verry, verry quiet... */
int noproxy = 0; /* Use proxies if env vars are set */
#define LONG_HEADER 1 #define LONG_HEADER 1
struct option long_options[] = { struct option long_options[] = {
@ -184,12 +185,13 @@ int wget_main(int argc, char **argv)
{ "quiet", 0, NULL, 'q' }, { "quiet", 0, NULL, 'q' },
{ "output-document", 1, NULL, 'O' }, { "output-document", 1, NULL, 'O' },
{ "header", 1, &which_long_opt, LONG_HEADER }, { "header", 1, &which_long_opt, LONG_HEADER },
{ "proxy", 1, NULL, 'Y' },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
/* /*
* Crack command line. * Crack command line.
*/ */
while ((n = getopt_long(argc, argv, "cqO:P:", long_options, &option_index)) != EOF) { while ((n = getopt_long(argc, argv, "cqO:P:Y:", long_options, &option_index)) != EOF) {
switch (n) { switch (n) {
case 'c': case 'c':
++do_continue; ++do_continue;
@ -207,6 +209,10 @@ int wget_main(int argc, char **argv)
*/ */
fname_out = optarg; fname_out = optarg;
break; break;
case 'Y':
if (strcmp(optarg, "off") == 0)
noproxy=1;
break;
case 0: case 0:
switch (which_long_opt) { switch (which_long_opt) {
case LONG_HEADER: { case LONG_HEADER: {
@ -238,9 +244,11 @@ int wget_main(int argc, char **argv)
/* /*
* Use the proxy if necessary. * Use the proxy if necessary.
*/ */
proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy"); if (!noproxy) {
if (proxy) proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
parse_url(xstrdup(proxy), &server); if (proxy)
parse_url(xstrdup(proxy), &server);
}
/* Guess an output filename */ /* Guess an output filename */
if (!fname_out) { if (!fname_out) {
@ -818,7 +826,7 @@ progressmeter(int flag)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: wget.c,v 1.48 2002/04/17 15:33:24 kraai Exp $ * $Id: wget.c,v 1.49 2002/05/14 23:36:45 sandman Exp $
*/ */