Fix extra compiler warnings

[project/uclient.git] / uclient.c

diff --git a/uclient.c b/uclient.c
index 612dbc163fdc0ebc7f686de670edeafd5c9f7397..95e4585a61cfa0f2ba90985e57d1b685255a1416 100644 (file)
--- 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)
@@ -120,6 +123,61 @@ uclient_split_host(const char *base, int *host_len)
        return location;
 }
 
+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)
 {
@@ -132,7 +190,7 @@ uclient_get_url(const char *url_str, const char *auth_str)
        struct uclient_url *url;
        const char *location;
        int host_len;
-       int i;
+       unsigned int i;
 
        for (i = 0; i < ARRAY_SIZE(backends); i++) {
                int prefix_len = 0;
@@ -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)
@@ -365,3 +422,23 @@ void __hidden uclient_backend_reset_state(struct uclient *cl)
        cl->error_code = 0;
        uloop_timeout_cancel(&cl->timeout);
 }
+
+const char * uclient_strerror(unsigned err)
+{
+       switch (err) {
+       case UCLIENT_ERROR_UNKNOWN:
+               return "unknown error";
+       case UCLIENT_ERROR_CONNECT:
+               return "connect failed";
+       case UCLIENT_ERROR_TIMEDOUT:
+               return "timeout";
+       case UCLIENT_ERROR_SSL_INVALID_CERT:
+               return "ssl invalid cert";
+       case UCLIENT_ERROR_SSL_CN_MISMATCH:
+               return "ssl cn mismatch";
+       case UCLIENT_ERROR_MISSING_SSL_CONTEXT:
+               return "missing ssl context";
+       default:
+               return "invalid error code";
+       }
+}