#include "busybox.h"
#include <stdio.h>
+#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <ctype.h>
#include <arpa/inet.h>
#include <netdb.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);
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)
{
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");
-
/*
* Use the proxy if necessary.
*/
curfile=argv[optind];
#endif
}
+ if (do_continue && !fname_out)
+ error_msg_and_die("cannot specify continue (-c) without a filename (-O)\n");
/*
* Open the output file stream.
*/
if (fname_out != (char *)1) {
- if ( (output=fopen(fname_out, (do_continue ? "a" : "w")))
- == NULL)
+ if ( (output=fopen(fname_out, (do_continue ? "a" : "w"))) == NULL)
perror_msg_and_die("fopen(%s)", fname_out);
} else {
output = stdout;
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");
* Retrieve HTTP response line and check for "200" status code.
*/
if (fgets(buf, sizeof(buf), sfp) == NULL) {
+ close_and_delete_outfile(output, fname_out, do_continue);
error_msg_and_die("no response from server\n");
}
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);
+ 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) {
+ 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\n", s);
continue;
}
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);
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: wget.c,v 1.16 2001/01/20 20:07:00 andersen Exp $
+ * $Id: wget.c,v 1.23 2001/01/27 08:24:38 andersen Exp $
*/