X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient-fetch.c;h=5ab2ea08faec0c118592432986d1da55059abf69;hp=fa60eb3ba18b099f1dfa644948ff7dfc3ea99c2d;hb=243aea1f7f1b50da2228a89812ff77a92dae82ad;hpb=b99c7ce8573f8650c4cafdc23ac7f44da46f4927

diff --git a/uclient-fetch.c b/uclient-fetch.c
index fa60eb3..5ab2ea0 100644
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -26,6 +26,7 @@
 #include <glob.h>
 #include <stdint.h>
 #include <inttypes.h>
+#include <signal.h>
 
 #include <libubox/blobmsg.h>
 
@@ -44,14 +45,13 @@ static struct ustream_ssl_ctx *ssl_ctx;
 static const struct ustream_ssl_ops *ssl_ops;
 static int quiet = false;
 static bool verify = true;
+static bool proxy = true;
 static bool default_certs = false;
 static bool no_output;
 static const char *output_file;
 static int output_fd = -1;
 static int error_ret;
 static int out_bytes;
-static char *username;
-static char *password;
 static char *auth_str;
 static char **urls;
 static int n_urls;
@@ -61,6 +61,27 @@ static bool resume, cur_resume;
 static int init_request(struct uclient *cl);
 static void request_done(struct uclient *cl);
 
+static const char *
+get_proxy_url(char *url)
+{
+	char prefix[16];
+	char *sep;
+
+	if (!proxy)
+		return NULL;
+
+	sep = strchr(url, ':');
+	if (!sep)
+		return NULL;
+
+	if (sep - url > 5)
+		return NULL;
+
+	memcpy(prefix, url, sep - url);
+	strcpy(prefix + (sep - url), "_proxy");
+	return getenv(prefix);
+}
+
 static int open_output_file(const char *path, uint64_t resume_offset)
 {
 	char *filename = NULL;
@@ -277,8 +298,16 @@ static int init_request(struct uclient *cl)
 
 static void request_done(struct uclient *cl)
 {
+	const char *proxy_url;
+
 	if (n_urls) {
-		uclient_set_url(cl, *urls, auth_str);
+		proxy_url = get_proxy_url(*urls);
+		if (proxy_url) {
+			uclient_set_url(cl, proxy_url, NULL);
+			uclient_set_proxy_url(cl, *urls, auth_str);
+		} else {
+			uclient_set_url(cl, *urls, auth_str);
+		}
 		n_urls--;
 		cur_resume = resume;
 		error_ret = init_request(cl);
@@ -359,12 +388,14 @@ static int usage(const char *progname)
 		"Options:\n"
 		"	-q:                             Turn off status messages\n"
 		"	-O <file>:                      Redirect output to file (use \"-\" for stdout)\n"
+		"	-P <dir>:			Set directory for output files\n"
 		"	--user=<user>			HTTP authentication username\n"
 		"	--password=<password>		HTTP authentication password\n"
 		"	--user-agent|-U <str>		Set HTTP user agent\n"
 		"	--post-data=STRING		use the POST method; send STRING as the data\n"
 		"	--spider|-s			Spider mode - only check file existence\n"
 		"	--timeout=N|-T N		Set connect/request timeout to N seconds\n"
+		"	--proxy=on|off|-Y on|off	Enable/disable env var configured proxy\n"
 		"\n"
 		"HTTPS options:\n"
 		"	--ca-certificate=<cert>:        Load CA certificates from file <cert>\n"
@@ -414,6 +445,8 @@ enum {
 	L_SPIDER,
 	L_TIMEOUT,
 	L_CONTINUE,
+	L_PROXY,
+	L_NO_PROXY,
 };
 
 static const struct option longopts[] = {
@@ -426,6 +459,8 @@ static const struct option longopts[] = {
 	[L_SPIDER] = { "spider", no_argument },
 	[L_TIMEOUT] = { "timeout", required_argument },
 	[L_CONTINUE] = { "continue", no_argument },
+	[L_PROXY] = { "proxy", required_argument },
+	[L_NO_PROXY] = { "no-proxy", no_argument },
 	{}
 };
 
@@ -434,15 +469,19 @@ static const struct option longopts[] = {
 int main(int argc, char **argv)
 {
 	const char *progname = argv[0];
+	const char *proxy_url;
+	char *username = NULL;
+	char *password = NULL;
 	struct uclient *cl;
 	int longopt_idx = 0;
 	bool has_cert = false;
 	int i, ch;
 	int rc;
 
+	signal(SIGPIPE, SIG_IGN);
 	init_ustream_ssl();
 
-	while ((ch = getopt_long(argc, argv, "cO:qsU:", longopts, &longopt_idx)) != -1) {
+	while ((ch = getopt_long(argc, argv, "cO:P:qsU:Y:", longopts, &longopt_idx)) != -1) {
 		switch(ch) {
 		case 0:
 			switch (longopt_idx) {
@@ -481,6 +520,13 @@ int main(int argc, char **argv)
 			case L_CONTINUE:
 				resume = true;
 				break;
+			case L_PROXY:
+				if (strcmp(optarg, "on") != 0)
+					proxy = false;
+				break;
+			case L_NO_PROXY:
+				proxy = false;
+				break;
 			default:
 				return usage(progname);
 			}
@@ -494,6 +540,13 @@ int main(int argc, char **argv)
 		case 'O':
 			output_file = optarg;
 			break;
+		case 'P':
+			if (chdir(optarg)) {
+				if (!quiet)
+					perror("Change output directory");
+				exit(1);
+			}
+			break;
 		case 'q':
 			quiet = true;
 			break;
@@ -503,6 +556,10 @@ int main(int argc, char **argv)
 		case 'T':
 			timeout = atoi(optarg);
 			break;
+		case 'Y':
+			if (strcmp(optarg, "on") != 0)
+				proxy = false;
+			break;
 		default:
 			return usage(progname);
 		}
@@ -539,7 +596,13 @@ int main(int argc, char **argv)
 	if (!quiet)
 		fprintf(stderr, "Downloading '%s'\n", argv[0]);
 
-	cl = uclient_new(argv[0], auth_str, &cb);
+	proxy_url = get_proxy_url(argv[0]);
+	if (proxy_url) {
+		cl = uclient_new(proxy_url, auth_str, &cb);
+		uclient_set_proxy_url(cl, argv[0], NULL);
+	} else {
+		cl = uclient_new(argv[0], auth_str, &cb);
+	}
 	if (!cl) {
 		fprintf(stderr, "Failed to allocate uclient context\n");
 		return 1;