Set current working URI to be that of the executable image when

executing any image, not just a script.  (This will enable pxelinux to
use relative URIs, should it wish to.)
This commit is contained in:
Michael Brown
2007-08-07 06:50:12 -07:00
parent 950057eeed
commit cfcc41d407
2 changed files with 13 additions and 12 deletions

View File

@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <errno.h>
#include <gpxe/image.h>
#include <gpxe/uri.h>
struct image_type script_image_type __image_type ( PROBE_NORMAL );
@@ -38,7 +37,6 @@ 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;
@@ -53,10 +51,6 @@ 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 */
@@ -93,9 +87,7 @@ static int script_exec ( struct image *image ) {
rc = 0;
done:
/* Reset current working directory, re-register image and return */
churi ( old_cwuri );
uri_put ( old_cwuri );
/* Re-register image and return */
register_image ( image );
image_put ( image );
return rc;