sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-04-04 03:00:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

[image] Ensure every image has a fully resolved URI

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2014-02-25 15:29:00 +00:00
parent 7667536527
commit c165e8d1fc
3 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/usr/imgmgmt.c
View File

@@ -48,13 +48,6 @@ int imgdownload ( struct uri *uri, struct image **image ) {
char *uri_string_redacted;
int rc;
/* Allocate image */
*image = alloc_image ( uri );
if ( ! *image ) {
rc = -ENOMEM;
goto err_alloc_image;
}
/* Construct redacted URI */
password = uri->password;
if ( password )
@@ -63,12 +56,25 @@ int imgdownload ( struct uri *uri, struct image **image ) {
uri->password = password;
if ( ! uri_string_redacted ) {
rc = -ENOMEM;
goto err_uri;
goto err_uri_string;
}
/* Resolve URI */
uri = resolve_uri ( cwuri, uri );
if ( ! uri ) {
rc = -ENOMEM;
goto err_resolve_uri;
}
/* Allocate image */
*image = alloc_image ( uri );
if ( ! *image ) {
rc = -ENOMEM;
goto err_alloc_image;
}
/* Create downloader */
if ( ( rc = create_downloader ( &monojob, *image, LOCATION_URI,
uri ) ) != 0 ) {
if ( ( rc = create_downloader ( &monojob, *image ) ) != 0 ) {
printf ( "Could not start download: %s\n", strerror ( rc ) );
goto err_create_downloader;
}
@@ -86,10 +92,12 @@ int imgdownload ( struct uri *uri, struct image **image ) {
err_register_image:
err_monojob_wait:
err_create_downloader:
free ( uri_string_redacted );
err_uri:
image_put ( *image );
err_alloc_image:
uri_put ( uri );
err_resolve_uri:
free ( uri_string_redacted );
err_uri_string:
return rc;
}