#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>
#include <arpa/inet.h>
#include <netdb.h>
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
#include <getopt.h>
#include "busybox.h"
/* For progressmeter() -- number of seconds before xfer considered "stalled" */
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) {
/*
* Base64-encode character string
* oops... isn't something similar in uuencode.c?
- * It would be better to use already existing code
+ * XXX: It would be better to use already existing code
*/
-char *base64enc(unsigned char *p, char *buf, int len) {
+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;
}
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;
}
headers_llist = headers_llist->link;
}
}
- if (argc - optind != 1)
- bb_show_usage();
parse_url(argv[optind], &target);
server.host = target.host;
use_proxy = 0;
}
}
-
+
/* Guess an output filename */
if (!fname_out) {
- fname_out =
+ // Dirty hack. Needed because bb_get_last_path_component
+ // will destroy trailing / by storing '\0' in last byte!
+ if(*target.path && target.path[strlen(target.path)-1]!='/') {
+ fname_out =
#ifdef CONFIG_FEATURE_WGET_STATUSBAR
- curfile =
+ curfile =
#endif
- bb_get_last_path_component(target.path);
+ bb_get_last_path_component(target.path);
+ }
if (fname_out==NULL || strlen(fname_out)<1) {
- fname_out =
+ fname_out =
#ifdef CONFIG_FEATURE_WGET_STATUSBAR
- curfile =
+ curfile =
#endif
"index.html";
}
*/
if (sfp) fclose(sfp);
sfp = open_socket(&s_in);
-
+
/*
* Send HTTP request.
*/
#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
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");
-
+
for (s = buf ; *s != '\0' && !isspace(*s) ; ++s)
;
for ( ; isspace(*s) ; ++s)
chomp(buf);
close_delete_and_die("server returned error %d: %s", atoi(s), buf);
}
-
+
/*
* Retrieve HTTP headers.
*/
}
}
} while(status >= 300);
-
+
dfp = sfp;
}
else
if (ftpcmd(NULL, NULL, sfp, buf) != 220)
close_delete_and_die("%s", buf+4);
- /*
+ /*
* Splitting username:password pair,
* trying to log in
*/
default:
close_delete_and_die("ftp login: %s", buf+4);
}
-
+
ftpcmd("CDUP", NULL, sfp, buf);
ftpcmd("TYPE I", NULL, sfp, buf);
-
+
/*
* Querying file size
*/
filesize = value;
got_clen = 1;
}
-
+
/*
* Entering passive mode
*/
} else
filesize -= beg_range;
}
-
+
if (ftpcmd("RETR /", target.path, sfp, buf) > 150)
close_delete_and_die("RETR: %s", buf+4);
static int ftpcmd(char *s1, char *s2, FILE *fp, char *buf)
{
- char *p;
-
if (s1) {
if (!s2) s2="";
fprintf(fp, "%s%s\r\n", s1, s2);
fflush(fp);
}
-
+
do {
- p = fgets(buf, 510, fp);
- if (!p)
+ char *buf_ptr;
+
+ if (fgets(buf, 510, fp) == NULL) {
bb_perror_msg_and_die("fgets()");
+ }
+ buf_ptr = strstr(buf, "\r\n");
+ if (buf_ptr) {
+ *buf_ptr = '\0';
+ }
} while (! isdigit(buf[0]) || buf[3] != ' ');
-
+
return atoi(buf);
}
#ifdef CONFIG_FEATURE_WGET_STATUSBAR
-/* Stuff below is from BSD rcp util.c, as added to openshh.
+/* Stuff below is from BSD rcp util.c, as added to openshh.
* Original copyright notice is retained at the end of this file.
- *
- */
+ *
+ */
static int
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
"%02d:%02d ETA", i / 60, i % 60);
}
- write(fileno(stderr), buf, strlen(buf));
+ write(STDERR_FILENO, buf, strlen(buf));
if (flag == -1) {
struct sigaction sa;
#endif
/* Original copyright notice which applies to the CONFIG_FEATURE_WGET_STATUSBAR stuff,
- * much of which was blatently stolen from openssh. */
-
+ * much of which was blatantly stolen from openssh. */
+
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
- * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
- * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
+ * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
+ * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
*
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: wget.c,v 1.70 2004/03/06 22:11:44 andersen Exp $
+ * $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:
-*/
projects / oweals / busybox.git / blobdiff