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

Treat URIs opened via xfer_open() and friends as relative to the 

current working URI.
pull/1/head
Michael Brown 2007-06-13 16:28:32 +01:00
parent 15dae1e042
commit 4f309ff0c7
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/open.c
View File

@ -48,18 +48,33 @@ static struct socket_opener socket_openers_end[0]
* @v xfer Data transfer interface * @v xfer Data transfer interface
* @v uri URI * @v uri URI
* @ret rc Return status code * @ret rc Return status code
*
* The URI will be regarded as being relative to the current working
* URI (see churi()).
*/ */
int xfer_open_uri ( struct xfer_interface *xfer, struct uri *uri ) { int xfer_open_uri ( struct xfer_interface *xfer, struct uri *uri ) {
struct uri_opener *opener; struct uri_opener *opener;
struct uri *resolved_uri;
int rc = -ENOTSUP;
/* Resolve URI */
resolved_uri = resolve_uri ( cwuri, uri );
if ( ! resolved_uri )
return -ENOMEM;
/* Find opener which supports this URI scheme */
for ( opener = uri_openers ; opener < uri_openers_end ; opener++ ) { for ( opener = uri_openers ; opener < uri_openers_end ; opener++ ) {
if ( strcmp ( uri->scheme, opener->scheme ) == 0 ) if ( strcmp ( resolved_uri->scheme, opener->scheme ) == 0 ) {
return opener->open ( xfer, uri ); rc = opener->open ( xfer, resolved_uri );
goto done;
}
} }
DBGC ( xfer, "XFER %p attempted to open unsupported URI scheme " DBGC ( xfer, "XFER %p attempted to open unsupported URI scheme "
"\"%s\"\n", xfer, uri->scheme ); "\"%s\"\n", xfer, resolved_uri->scheme );
return -ENOTSUP;
done:
uri_put ( resolved_uri );
return rc;
} }
/** /**
@ -68,6 +83,9 @@ int xfer_open_uri ( struct xfer_interface *xfer, struct uri *uri ) {
* @v xfer Data transfer interface * @v xfer Data transfer interface
* @v uri_string URI string (e.g. "http://etherboot.org/kernel") * @v uri_string URI string (e.g. "http://etherboot.org/kernel")
* @ret rc Return status code * @ret rc Return status code
*
* The URI will be regarded as being relative to the current working
* URI (see churi()).
*/ */
int xfer_open_uri_string ( struct xfer_interface *xfer, int xfer_open_uri_string ( struct xfer_interface *xfer,
const char *uri_string ) { const char *uri_string ) {