Fixed a memory leak in lash. It seems that close_all was calling close()

[oweals/busybox.git] / wget.c

diff --git a/wget.c b/wget.c
index a5c3e7bafe5c224f2b43c6048061efd353b33515..4b8392ba5fea9d416b14809439d78239ad72e751 100644 (file)
--- a/wget.c
+++ b/wget.c
@@ -14,12 +14,8 @@
  *
  */
 
-#warning This applet has moved to netkit-tiny.  After BusyBox 0.49, this
-#warning applet will be removed from BusyBox.  All maintainence efforts
-#warning should be done in the netkit-tiny source tree.
-
-#include "busybox.h"
 #include <stdio.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <ctype.h>
@@ -36,6 +32,20 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
+#include "busybox.h"
+
+/* 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);
@@ -49,8 +59,16 @@ 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)
 {
@@ -88,15 +106,12 @@ int wget_main(int argc, char **argv)
                        fname_out = (strcmp(optarg, "-") == 0 ? (char *)1 : optarg);
                        break;
                default:
-                       usage(wget_usage);
+                       show_usage();
                }
        }
 
        if (argc - optind != 1)
-                       usage(wget_usage);
-
-       if (do_continue && !fname_out)
-               error_msg_and_die("cannot specify continue (-c) without a filename (-O)\n");
+                       show_usage();
 
        /*
         * Use the proxy if necessary.
@@ -133,6 +148,8 @@ int wget_main(int argc, char **argv)
                curfile=argv[optind];
 #endif
        }
+       if (do_continue && !fname_out)
+               error_msg_and_die("cannot specify continue (-c) without a filename (-O)");
 
 
        /*
@@ -151,9 +168,7 @@ int wget_main(int argc, char **argv)
         * Open the output file stream.
         */
        if (fname_out != (char *)1) {
-               if ( (output=fopen(fname_out, (do_continue ? "a" : "w"))) 
-                               == NULL)
-                       perror_msg_and_die("fopen(%s)", fname_out);
+               output = xfopen( fname_out, (do_continue ? "a" : "w") );
        } else {
                output = stdout;
        }
@@ -176,6 +191,7 @@ int wget_main(int argc, char **argv)
        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);
        fprintf(sfp,"Connection: close\r\n\r\n");
@@ -184,36 +200,39 @@ int wget_main(int argc, char **argv)
         * Retrieve HTTP response line and check for "200" status code.
         */
        if (fgets(buf, sizeof(buf), sfp) == NULL) {
-               error_msg_and_die("no response from server\n");
+               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;
-                       error_msg_and_die("server does not support ranges\n");
+                       break;
                case 206:
                        if (do_continue)
                                break;
                        /*FALLTHRU*/
                default:
-                       error_msg_and_die("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) {
-                       error_msg_and_die("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;
                }
        }
@@ -250,7 +269,7 @@ void parse_url(char *url, char **uri_host, int *uri_port, char **uri_path)
        *uri_port = 80;
 
        if (strncmp(url, "http://", 7) != 0)
-               error_msg_and_die("not an http url: %s\n", url);
+               error_msg_and_die("not an http url: %s", url);
 
        *uri_host = url + 7;
 
@@ -277,10 +296,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)
-               error_msg_and_die("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);
 
@@ -321,7 +340,7 @@ char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc)
 
        /* verify we are at the end of the header name */
        if (*s != ':')
-               error_msg_and_die("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)
@@ -515,7 +534,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.17 2001/01/22 22:48:42 andersen Exp $
+ *     $Id: wget.c,v 1.28 2001/02/20 06:14:08 andersen Exp $
  */