X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient.c;h=11371684e8a15cdd8566263d2a3b8b670880b7a2;hp=612dbc163fdc0ebc7f686de670edeafd5c9f7397;hb=HEAD;hpb=1f7c964d0634478dd0cf79f71d5bd4dcb2c5f37c;ds=sidebyside

diff --git a/uclient.c b/uclient.c
index 612dbc1..1137168 100644
--- a/uclient.c
+++ b/uclient.c
@@ -59,6 +59,9 @@ __uclient_get_url(const struct uclient_backend *backend,
 		&uri_buf, strlen(location) + 1,
 		&auth_buf, auth_str ? strlen(auth_str) + 1 : 0);
 
+	if (!url)
+		return NULL;
+
 	url->backend = backend;
 	url->location = strcpy(uri_buf, location);
 	if (host)
@@ -121,6 +124,61 @@ uclient_split_host(const char *base, int *host_len)
 }
 
 struct uclient_url __hidden *
+uclient_get_url_location(struct uclient_url *url, const char *location)
+{
+	struct uclient_url *new_url;
+	char *host_buf, *uri_buf, *auth_buf, *port_buf;
+	int host_len = strlen(url->host) + 1;
+	int auth_len = url->auth ? strlen(url->auth) + 1 : 0;
+	int port_len = url->port ? strlen(url->port) + 1 : 0;
+	int uri_len;
+
+	if (strstr(location, "://"))
+		return uclient_get_url(location, url->auth);
+
+	if (location[0] == '/')
+		uri_len = strlen(location) + 1;
+	else
+		uri_len = strlen(url->location) + strlen(location) + 2;
+
+	new_url = calloc_a(sizeof(*url),
+		&host_buf, host_len,
+		&port_buf, port_len,
+		&uri_buf, uri_len,
+		&auth_buf, auth_len);
+
+	if (!new_url)
+		return NULL;
+
+	new_url->backend = url->backend;
+	new_url->prefix = url->prefix;
+	new_url->host = strcpy(host_buf, url->host);
+	if (url->port)
+		new_url->port = strcpy(port_buf, url->port);
+	if (url->auth)
+		new_url->auth = strcpy(auth_buf, url->auth);
+
+	new_url->location = uri_buf;
+	if (location[0] == '/')
+		strcpy(uri_buf, location);
+	else {
+		int len = strcspn(url->location, "?#");
+		char *buf = uri_buf;
+
+		memcpy(buf, url->location, len);
+		if (buf[len - 1] != '/') {
+			buf[len] = '/';
+			len++;
+		}
+
+		buf += len;
+		strcpy(buf, location);
+	}
+
+	return new_url;
+}
+
+struct uclient_url __hidden *
 uclient_get_url(const char *url_str, const char *auth_str)
 {
 	static const struct uclient_backend *backends[] = {
@@ -200,7 +258,6 @@ int uclient_set_proxy_url(struct uclient *cl, const char *url_str, const char *a
 {
 	const struct uclient_backend *backend = cl->backend;
 	struct uclient_url *url;
-	const char *location;
 	int host_len;
 	char *next, *host;
 
@@ -212,7 +269,7 @@ int uclient_set_proxy_url(struct uclient *cl, const char *url_str, const char *a
 		return -1;
 
 	host = next + 3;
-	location = uclient_split_host(host, &host_len);
+	uclient_split_host(host, &host_len);
 
 	url = __uclient_get_url(NULL, host, host_len, url_str, auth_str);
 	if (!url)