[uri] Support "file:" URIs describing relative paths

Signed-off-by: Michael Brown <mcb30@ipxe.org>
ipxe · Mar 14, 2016 · 7549681 · 7549681
1 parent 17c1488
commit 7549681
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/core/uri.c b/src/core/uri.c
@@ -157,7 +157,7 @@ static int uri_character_escaped ( char c, unsigned int field ) {
 		 * the reparsing of the URI, allowing everything else
 		 * (e.g. ':', which will appear in iSCSI URIs).
 		 */
-		[URI_OPAQUE]	= "/#",
+		[URI_OPAQUE]	= "#",
 		/* User name: escape everything */
 		[URI_USER]	= "/#:@?",
 		/* Password: escape everything */

diff --git a/src/tests/uri_test.c b/src/tests/uri_test.c
@@ -612,10 +612,10 @@ static struct uri_test uri_iscsi = {
 
 /** File URI with relative (opaque) path */
 static struct uri_test uri_file_relative = {
-	"file:script.ipxe",
+	"file:boot/script.ipxe",
 	{
 		.scheme = "file",
-		.opaque = "script.ipxe",
+		.opaque = "boot/script.ipxe",
 	},
 };