From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 16 Jan 2016 10:43:40 +0000 (+0100)
Subject: uclient-fetch: add support for fetching multiple urls
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=80f70f68d9db7a48e356a8074a179cfcaa728bd9;p=oweals%2Fuclient.git

uclient-fetch: add support for fetching multiple urls

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/uclient-fetch.c b/uclient-fetch.c
index 965f621..b65a9fd 100644
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -47,6 +47,10 @@ static int out_bytes;
 static char *username;
 static char *password;
 static char *auth_str;
+static char **urls;
+static int n_urls;
+
+static void request_done(struct uclient *cl);
 
 static int open_output_file(const char *path, bool create)
 {
@@ -77,16 +81,6 @@ static int open_output_file(const char *path, bool create)
 	return ret;
 }
 
-static void request_done(struct uclient *cl)
-{
-	if (output_fd >= 0 && !output_file) {
-		close(output_fd);
-		output_fd = -1;
-	}
-	uclient_disconnect(cl);
-	uloop_end();
-}
-
 static void header_done_cb(struct uclient *cl)
 {
 	static int retries;
@@ -156,6 +150,7 @@ static int init_request(struct uclient *cl)
 	int rc;
 
 	out_bytes = 0;
+	uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
 
 	rc = uclient_connect(cl);
 	if (rc)
@@ -174,6 +169,25 @@ static int init_request(struct uclient *cl)
 	return 0;
 }
 
+static void request_done(struct uclient *cl)
+{
+	if (n_urls) {
+		uclient_set_url(cl, *urls, auth_str);
+		n_urls--;
+		error_ret = init_request(cl);
+		if (error_ret == 0)
+			return;
+	}
+
+	if (output_fd >= 0 && !output_file) {
+		close(output_fd);
+		output_fd = -1;
+	}
+	uclient_disconnect(cl);
+	uloop_end();
+}
+
+
 static void eof_cb(struct uclient *cl)
 {
 	if (!cl->data_eof) {
@@ -294,13 +308,15 @@ static const struct option longopts[] = {
 	{}
 };
 
+
+
 int main(int argc, char **argv)
 {
 	const char *progname = argv[0];
 	struct uclient *cl;
-	int ch;
 	int longopt_idx = 0;
 	bool has_cert = false;
+	int i, ch;
 	int rc;
 
 	init_ustream_ssl();
@@ -350,11 +366,18 @@ int main(int argc, char **argv)
 	if (verify && !has_cert)
 		default_certs = true;
 
-	if (argc != 1)
+	if (argc < 1)
 		return usage(progname);
 
-	if (!strncmp(argv[0], "https", 5) && !ssl_ctx)
-		return no_ssl(progname);
+	if (!ssl_ctx) {
+		for (i = 0; i < argc; i++) {
+			if (!strncmp(argv[i], "https", 5))
+				return no_ssl(progname);
+		}
+	}
+
+	urls = argv + 1;
+	n_urls = argc - 1;
 
 	uloop_init();
 
@@ -374,10 +397,8 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	if (ssl_ctx) {
+	if (ssl_ctx)
 		init_ca_cert();
-		uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
-	}
 
 	rc = init_request(cl);
 	if (!rc) {