Fix some warnings in allbareconfig.

[oweals/busybox.git] / networking / wget.c

diff --git a/networking/wget.c b/networking/wget.c
index 59f30c06d0baec7ea525d38d772a308cbbebfff0..fdcc68df31ffcb5459e03af70e4445861c4770b8 100644 (file)
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -12,11 +12,11 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <string.h>
+#include <strings.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>
@@ -24,9 +24,6 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #include <getopt.h>
 
 #include "busybox.h"
@@ -121,22 +118,22 @@ static char *safe_fgets(char *s, int size, FILE *stream)
  */
 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,23 +174,25 @@ 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 use_proxy = 1;          /* 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;
        }
@@ -218,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;
@@ -241,7 +238,7 @@ int wget_main(int argc, char **argv)
        if (!fname_out) {
                // Dirty hack. Needed because bb_get_last_path_component
                // will destroy trailing / by storing '\0' in last byte!
-               if(target.path[strlen(target.path)-1]!='/') {
+               if(*target.path && target.path[strlen(target.path)-1]!='/') {
                        fname_out =
 #ifdef CONFIG_FEATURE_WGET_STATUSBAR
                                curfile =
@@ -335,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 (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
 
@@ -350,8 +347,8 @@ 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");
@@ -856,13 +853,3 @@ progressmeter(int flag)
  *
  *     $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:
-*/