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

diff --git a/include/usage.h b/include/usage.h
index c24d71ebd50d28c42e8140e0b9b3b72c703ee35d..823d9529687c96c57a4adc5fa653c60cf2f256b0 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -1960,14 +1960,15 @@
        "     31      46    1365 /etc/passwd\n" 
 
 #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 \
        "wget retrieves files via HTTP or FTP\n\n" \
        "Options:\n" \
        "\t-c\tcontinue retrieval of aborted transfers\n" \
        "\t-q\tquiet mode - do not print\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 \
        "[COMMAND ...]"

diff --git a/networking/wget.c b/networking/wget.c
index a1c18bcf1987e3fe2d7be7e6ce2fade0d008b819..6974c70a8f4ac238296da499970d1d7a75f94087 100644 (file)
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -159,7 +159,7 @@ int wget_main(int argc, char **argv)
 {
        int n, try=5, status;
        int port;
-       char *proxy;
+       char *proxy = 0;
        char *dir_prefix=NULL;
        char *s, buf[512];
        struct stat sbuf;
@@ -177,6 +177,7 @@ int wget_main(int argc, char **argv)
        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[] = {
@@ -184,12 +185,13 @@ int wget_main(int argc, char **argv)
                { "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:", long_options, &option_index)) != EOF) {
+       while ((n = getopt_long(argc, argv, "cqO:P:Y:", long_options, &option_index)) != EOF) {
                switch (n) {
                case 'c':
                        ++do_continue;
@@ -207,6 +209,10 @@ int wget_main(int argc, char **argv)
                         */
                        fname_out = optarg;
                        break;
+               case 'Y':
+                       if (strcmp(optarg, "off") == 0)
+                               noproxy=1;      
+                       break;
                case 0:
                        switch (which_long_opt) {
                                case LONG_HEADER: {
@@ -238,9 +244,11 @@ int wget_main(int argc, char **argv)
        /*
         * Use the proxy if necessary.
         */
-       proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
-       if (proxy)
-               parse_url(xstrdup(proxy), &server);
+       if (!noproxy) {
+               proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
+               if (proxy)
+                       parse_url(xstrdup(proxy), &server);
+       }
        
        /* Guess an output filename */
        if (!fname_out) {
@@ -818,7 +826,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.48 2002/04/17 15:33:24 kraai Exp $
+ *     $Id: wget.c,v 1.49 2002/05/14 23:36:45 sandman Exp $
  */