X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Furls%2Fparse-url.c;h=6637867c50497b5ff668a60194a02033080d0703;hp=3e2f10f0871c2be2aead6de56751942f239b0dfc;hb=refs%2Ftags%2Fv1.4.2;hpb=bf40f5fbd759241d1505c985fa02441cd6febd64

diff --git a/test/urls/parse-url.c b/test/urls/parse-url.c
index 3e2f10f..6637867 100644
--- a/test/urls/parse-url.c
+++ b/test/urls/parse-url.c
@@ -2,28 +2,37 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <ui/common/url.h>
+#include <talloc/talloc.h>
+#include <url/url.h>
 #include <log/log.h>
 
 int main(int argc, char **argv)
 {
 	struct pb_url *url;
-	FILE *null;
+	void *ctx;
 
-	if (argc != 2) {
-		fprintf(stderr, "Usage: %s <URL>\n", argv[0]);
+	if (argc != 2 && argc != 3) {
+		fprintf(stderr, "Usage: %s <URL> [update]\n", argv[0]);
 		return EXIT_FAILURE;
 	}
 
-	/* discard log output */
-	null = fopen("/dev/null", "w");
-	pb_log_set_stream(null);
+	ctx = talloc_new(NULL);
 
-	url = pb_url_parse(NULL, argv[1]);
+	url = pb_url_parse(ctx, argv[1]);
 	if (!url)
 		return EXIT_FAILURE;
 
-	printf("%s\n", argv[1]);
+	if (argc == 2) {
+		printf("%s\n", argv[1]);
+
+	} else {
+		struct pb_url *new_url;
+		printf("%s %s\n", argv[1], argv[2]);
+		new_url = pb_url_join(ctx, url, argv[2]);
+		talloc_free(url);
+		url = new_url;
+	}
+
 	printf("scheme\t%s\n", pb_url_scheme_name(url->scheme));
 	printf("host\t%s\n", url->host);
 	printf("port\t%s\n", url->port);
@@ -31,5 +40,7 @@ int main(int argc, char **argv)
 	printf("dir\t%s\n", url->dir);
 	printf("file\t%s\n", url->file);
 
+	talloc_free(ctx);
+
 	return EXIT_SUCCESS;
 }