X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Furl%2Furl.c;h=7202f4965414be300cd9e1c5cb0ee8ea68c3c29b;hp=ae72b103de62153e2a8e779286c7a8d3a01d2a55;hb=485680a5bfeb952fd652a59efcce35636d6aec00;hpb=6276a57e76cf22aac639236d4782b56e2e5b9d5e;ds=sidebyside

diff --git a/lib/url/url.c b/lib/url/url.c
index ae72b10..7202f49 100644
--- a/lib/url/url.c
+++ b/lib/url/url.c
@@ -20,9 +20,7 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 #include <assert.h>
-#include <stdbool.h>
 #include <string.h>
 
 #include "log/log.h"
@@ -129,9 +127,7 @@ static const struct pb_scheme_info *pb_url_find_scheme(const char *url)
 		return scheme;
 	}
 
-	/* Assume this is a non-url local file. */
-
-	return file_scheme;
+	return NULL;
 }
 
 static void pb_url_parse_path(struct pb_url *url)
@@ -164,8 +160,6 @@ struct pb_url *pb_url_parse(void *ctx, const char *url_str)
 	struct pb_url *url;
 	const char *p;
 
-	pb_log("%s: '%s'\n", __func__, url_str);
-
 	if (!url_str || !*url_str) {
 		assert(0 && "bad url");
 		return NULL;
@@ -177,9 +171,13 @@ struct pb_url *pb_url_parse(void *ctx, const char *url_str)
 		return NULL;
 
 	si = pb_url_find_scheme(url_str);
-
-	url->scheme = si->scheme;
-	p = url_str + si->str_len + strlen("://");
+	if (si) {
+		url->scheme = si->scheme;
+		p = url_str + si->str_len + strlen("://");
+	} else {
+		url->scheme = file_scheme->scheme;
+		p = url_str;
+	}
 
 	url->full = talloc_strdup(url, url_str);
 
@@ -221,13 +219,6 @@ struct pb_url *pb_url_parse(void *ctx, const char *url_str)
 
 	pb_url_parse_path(url);
 
-	pb_log(" scheme %d\n", url->scheme);
-	pb_log(" host '%s'\n", url->host);
-	pb_log(" port '%s'\n", url->port);
-	pb_log(" path '%s'\n", url->path);
-	pb_log(" dir '%s'\n", url->dir);
-	pb_log(" file '%s'\n", url->file);
-
 	return url;
 
 fail:
@@ -235,36 +226,39 @@ fail:
 	return NULL;
 }
 
-static bool is_url(const char *str)
+bool is_url(const char *str)
 {
 	return strstr(str, "://") != NULL;
 }
 
-static void pb_url_update_full(struct pb_url *url)
+char *pb_url_to_string(struct pb_url *url)
 {
 	const struct pb_scheme_info *scheme = pb_url_scheme_info(url->scheme);
-
 	assert(scheme);
 
-	talloc_free(url->full);
-
-	url->full = talloc_asprintf(url, "%s://%s%s", scheme->str,
+	return talloc_asprintf(url, "%s://%s%s", scheme->str,
 			scheme->has_host ? url->host : "", url->path);
 }
 
+static void pb_url_update_full(struct pb_url *url)
+{
+	talloc_free(url->full);
+	url->full = pb_url_to_string(url);
+}
+
 static struct pb_url *pb_url_copy(void *ctx, const struct pb_url *url)
 {
 	struct pb_url *new_url;
 
 	new_url = talloc(ctx, struct pb_url);
 	new_url->scheme = url->scheme;
-	new_url->full = talloc_strdup(url, url->full);
+	new_url->full = talloc_strdup(new_url, url->full);
 
-	new_url->host = url->host ? talloc_strdup(url, url->host) : NULL;
-	new_url->port = url->port ? talloc_strdup(url, url->port) : NULL;
-	new_url->path = url->path ? talloc_strdup(url, url->path) : NULL;
-	new_url->dir  = url->dir  ? talloc_strdup(url, url->dir)  : NULL;
-	new_url->file = url->file ? talloc_strdup(url, url->file) : NULL;
+	new_url->host = url->host ? talloc_strdup(new_url, url->host) : NULL;
+	new_url->port = url->port ? talloc_strdup(new_url, url->port) : NULL;
+	new_url->path = url->path ? talloc_strdup(new_url, url->path) : NULL;
+	new_url->dir  = url->dir  ? talloc_strdup(new_url, url->dir)  : NULL;
+	new_url->file = url->file ? talloc_strdup(new_url, url->file) : NULL;
 
 	return new_url;
 }