[image] Generalise "currently-running script" to "currently-running image"

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2011-03-09 13:38:56 +00:00
parent d17a84a056
commit ae92700fd4
3 changed files with 24 additions and 23 deletions

View File

@@ -39,6 +39,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
/** List of registered images */
struct list_head images = LIST_HEAD_INIT ( images );
/** Currently-executing image */
struct image *current_image;
/**
* Free executable image
*
@@ -200,6 +203,7 @@ int image_probe ( struct image *image ) {
* @ret rc Return status code
*/
int image_exec ( struct image *image ) {
struct image *saved_current_image;
struct image *replacement;
struct uri *old_cwuri;
int rc;
@@ -212,11 +216,14 @@ int image_exec ( struct image *image ) {
old_cwuri = uri_get ( cwuri );
churi ( image->uri );
/* Preserve record of any currently-running image */
saved_current_image = current_image;
/* Take out a temporary reference to the image. This allows
* the image to unregister itself if necessary, without
* automatically freeing itself.
*/
image_get ( image );
current_image = image_get ( image );
/* Try executing the image */
if ( ( rc = image->type->exec ( image ) ) != 0 ) {
@@ -233,6 +240,9 @@ int image_exec ( struct image *image ) {
/* Drop temporary reference to the original image */
image_put ( image );
/* Restore previous currently-running image */
current_image = saved_current_image;
/* Reset current working directory */
churi ( old_cwuri );
uri_put ( old_cwuri );