*
*/
-#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>
+#include "busybox.h"
-void parse_url(char *url, char **uri_host, int *uri_port, char **uri_path);
-FILE *open_socket(char *host, int port);
-char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc);
-void progressmeter(int flag);
+/* 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
+
+static void parse_url(char *url, char **uri_host, int *uri_port, char **uri_path);
+static FILE *open_socket(char *host, int port);
+static char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc);
+static void progressmeter(int flag);
/* Globals (can be accessed from signal handlers */
static off_t filesize = 0; /* content-length of the file */
-#ifdef BB_FEATURE_STATUSBAR
+#ifdef BB_FEATURE_WGET_STATUSBAR
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. */
+static 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
+
+static 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)
{
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.
/* Guess an output filename */
if (!fname_out) {
fname_out =
-#ifdef BB_FEATURE_STATUSBAR
+#ifdef BB_FEATURE_WGET_STATUSBAR
curfile =
#endif
get_last_path_component(uri_path);
if (fname_out==NULL || strlen(fname_out)<1) {
fname_out =
-#ifdef BB_FEATURE_STATUSBAR
+#ifdef BB_FEATURE_WGET_STATUSBAR
curfile =
#endif
"index.html";
}
-#ifdef BB_FEATURE_STATUSBAR
+#ifdef BB_FEATURE_WGET_STATUSBAR
} else {
curfile=argv[optind];
#endif
}
+ if (do_continue && !fname_out)
+ error_msg_and_die("cannot specify continue (-c) without a filename (-O)");
/*
* 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;
}
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) {
- 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;
}
}
/*
* Retrieve HTTP body.
*/
-#ifdef BB_FEATURE_STATUSBAR
+#ifdef BB_FEATURE_WGET_STATUSBAR
statbytes=0;
if (quiet_flag==FALSE)
progressmeter(-1);
#endif
while (filesize > 0 && (n = fread(buf, 1, sizeof(buf), sfp)) > 0) {
fwrite(buf, 1, n, output);
-#ifdef BB_FEATURE_STATUSBAR
+#ifdef BB_FEATURE_WGET_STATUSBAR
statbytes+=n;
if (quiet_flag==FALSE)
progressmeter(1);
*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;
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);
/* 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)
return hdrval;
}
-#ifdef BB_FEATURE_STATUSBAR
+#ifdef BB_FEATURE_WGET_STATUSBAR
/* Stuff below is from BSD rcp util.c, as added to openshh.
* Original copyright notice is retained at the end of this file.
*
*/
-int
+static int
getttywidth(void)
{
struct winsize winsize;
return (80);
}
-void
+static void
updateprogressmeter(int ignore)
{
int save_errno = errno;
errno = save_errno;
}
-void
+static void
alarmtimer(int wait)
{
struct itimerval itv;
}
-void
+static void
progressmeter(int flag)
{
static const char prefixes[] = " KMGTP";
}
#endif
-/* Original copyright notice which applies to the BB_FEATURE_STATUSBAR stuff,
+/* Original copyright notice which applies to the BB_FEATURE_WGET_STATUSBAR stuff,
* much of which was blatently stolen from openssh. */
/*-
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: wget.c,v 1.15 2001/01/03 16:15:15 kraai Exp $
+ * $Id: wget.c,v 1.29 2001/03/09 21:24:12 andersen Exp $
*/
projects / oweals / busybox.git / blobdiff