narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[uri] Support URIs containing only scheme and path components 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/51/head
Michael Brown 2016-03-13 14:51:15 +00:00
parent 11ccfb67fa
commit 17c1488a44
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/uri.c
View File

@ -456,7 +456,6 @@ unsigned int uri_port ( const struct uri *uri, unsigned int default_port ) {
*/ */
size_t format_uri ( const struct uri *uri, char *buf, size_t len ) { size_t format_uri ( const struct uri *uri, char *buf, size_t len ) {
static const char prefixes[URI_FIELDS] = { static const char prefixes[URI_FIELDS] = {
[URI_OPAQUE] = ':',
[URI_PASSWORD] = ':', [URI_PASSWORD] = ':',
[URI_PORT] = ':', [URI_PORT] = ':',
[URI_QUERY] = '?', [URI_QUERY] = '?',
@ -495,9 +494,9 @@ size_t format_uri ( const struct uri *uri, char *buf, size_t len ) {
( buf + used ), ( len - used ) ); ( buf + used ), ( len - used ) );
/* Suffix this field, if applicable */ /* Suffix this field, if applicable */
if ( ( field == URI_SCHEME ) && ( ! uri->opaque ) ) { if ( field == URI_SCHEME ) {
used += ssnprintf ( ( buf + used ), ( len - used ), used += ssnprintf ( ( buf + used ), ( len - used ),
"://" ); ":%s", ( uri->host ? "//" : "" ) );
} }
} }

31
src/tests/uri_test.c
View File

@ -610,6 +610,34 @@ static struct uri_test uri_iscsi = {
}, },
}; };
/** File URI with relative (opaque) path */
static struct uri_test uri_file_relative = {
"file:script.ipxe",
{
.scheme = "file",
.opaque = "script.ipxe",
},
};
/** File URI with absolute path */
static struct uri_test uri_file_absolute = {
"file:/boot/script.ipxe",
{
.scheme = "file",
.path = "/boot/script.ipxe",
},
};
/** File URI with volume name */
static struct uri_test uri_file_volume = {
"file://hpilo/boot/script.ipxe",
{
.scheme = "file",
.host = "hpilo",
.path = "/boot/script.ipxe",
},
};
/** URI with port number */ /** URI with port number */
static struct uri_port_test uri_explicit_port = { static struct uri_port_test uri_explicit_port = {
"http://192.168.0.1:8080/boot.php", "http://192.168.0.1:8080/boot.php",
@ -899,6 +927,9 @@ static void uri_test_exec ( void ) {
uri_parse_format_dup_ok ( &uri_ipv6_local ); uri_parse_format_dup_ok ( &uri_ipv6_local );
uri_parse_ok ( &uri_ipv6_local_non_conforming ); /* Parse only */ uri_parse_ok ( &uri_ipv6_local_non_conforming ); /* Parse only */
uri_parse_format_dup_ok ( &uri_iscsi ); uri_parse_format_dup_ok ( &uri_iscsi );
uri_parse_format_dup_ok ( &uri_file_relative );
uri_parse_format_dup_ok ( &uri_file_absolute );
uri_parse_format_dup_ok ( &uri_file_volume );
/** URI port number tests */ /** URI port number tests */
uri_port_ok ( &uri_explicit_port ); uri_port_ok ( &uri_explicit_port );