X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Furl%2Furl.c;h=b74018ddd0f300f4d8ca7d2efffa3fc3451e85fe;hp=44e9ac403b7daa4c9e04ad549b4f45b4cc3e661b;hb=refs%2Ftags%2Fv1.10.1;hpb=89cde533356d47b34a80679602c3900572b2dca6 diff --git a/lib/url/url.c b/lib/url/url.c index 44e9ac4..b74018d 100644 --- a/lib/url/url.c +++ b/lib/url/url.c @@ -265,14 +265,21 @@ int addr_scheme(const char *address) char *pb_url_to_string(struct pb_url *url) { const struct pb_scheme_info *scheme = pb_url_scheme_info(url->scheme); + char *str, *port; assert(scheme); + port = url->port ? talloc_asprintf(url, ":%s", url->port) : NULL; + if (scheme->has_host && addr_scheme(url->host) == AF_INET6) - return talloc_asprintf(url, "%s://[%s]%s", scheme->str, - url->host, url->path); + str = talloc_asprintf(url, "%s://[%s]%s%s", scheme->str, + url->host, port ?: "", url->path); else - return talloc_asprintf(url, "%s://%s%s", scheme->str, - scheme->has_host ? url->host : "", url->path); + str = talloc_asprintf(url, "%s://%s%s%s", scheme->str, + scheme->has_host ? url->host : "", + port ?: "", url->path); + + talloc_free(port); + return str; } static void pb_url_update_full(struct pb_url *url)