discover/grub2: Allow to separate the --id argument using a space char

[petitboot] / lib / url / url.c

diff --git a/lib/url/url.c b/lib/url/url.c
index f0e8b0eef610ae7021c6b749fd396ddfa6039be3..b74018ddd0f300f4d8ca7d2efffa3fc3451e85fe 100644 (file)
--- a/lib/url/url.c
+++ b/lib/url/url.c
@@ -193,7 +193,7 @@ struct pb_url *pb_url_parse(void *ctx, const char *url_str)
                path = strchr(p, '/');
 
                if (!path) {
-                       pb_log("%s: parse path failed '%s'\n", __func__ , p);
+                       pb_log_fn("parse path failed '%s'\n" , p);
                        goto fail;
                }
 
@@ -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)