From 1ae40765a665244804891d9c3c6ed95e0f641ad9 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 2 Aug 2007 20:27:19 +0100 Subject: [PATCH] Set current working URI equal to script URI during script execution. --- src/image/script.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/image/script.c b/src/image/script.c index c8821522..2f159c97 100644 --- a/src/image/script.c +++ b/src/image/script.c @@ -27,6 +27,7 @@ #include #include #include +#include struct image_type script_image_type __image_type ( PROBE_NORMAL ); @@ -37,6 +38,7 @@ struct image_type script_image_type __image_type ( PROBE_NORMAL ); * @ret rc Return status code */ static int script_exec ( struct image *image ) { + struct uri *old_cwuri; char cmdbuf[256]; size_t offset = 0; size_t remaining; @@ -51,6 +53,10 @@ static int script_exec ( struct image *image ) { image_get ( image ); unregister_image ( image ); + /* Switch current working directory to be that of the script itself */ + old_cwuri = uri_get ( cwuri ); + churi ( image->uri ); + while ( offset < image->len ) { /* Read up to cmdbuf bytes from script into buffer */ @@ -87,7 +93,9 @@ static int script_exec ( struct image *image ) { rc = 0; done: - /* Re-register image and return */ + /* Reset current working directory, re-register image and return */ + churi ( old_cwuri ); + uri_put ( old_cwuri ); register_image ( image ); image_put ( image ); return rc;