cbfstool: Use cbfs_image API for "extract" command.

Change the "extract" command to use cbfs_export_entry API. Nothing changed in
its usage.

To verify, run "cbfstool coreboot.rom extract -f blah -n blah" and check if the
raw type file is correctly extracted.

Change-Id: I1ed280d47a2224a9d1213709f6b459b403ce5055
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: http://review.coreboot.org/2207
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Hung-Te Lin
2013-01-29 02:29:49 +08:00
committed by Stefan Reinauer
parent 3bb035b095
commit 0f8af71f1a
3 changed files with 58 additions and 9 deletions

View File

@@ -401,8 +401,8 @@ static int cbfs_print(void)
static int cbfs_extract(void)
{
void *rom;
int ret;
int result = 0;
struct cbfs_image image;
if (!param.filename) {
ERROR("You need to specify -f/--filename.\n");
@@ -414,17 +414,17 @@ static int cbfs_extract(void)
return 1;
}
rom = loadrom(param.cbfs_name);
if (rom == NULL) {
if (cbfs_image_from_file(&image, param.cbfs_name) != 0) {
ERROR("Could not load ROM image '%s'.\n",
param.cbfs_name);
return 1;
result = 1;
} else if (cbfs_export_entry(&image, param.name,
param.filename) != 0) {
result = 1;
}
ret = extract_file_from_cbfs(param.cbfs_name, param.name, param.filename);
free(rom);
return ret;
cbfs_image_delete(&image);
return result;
}
static const struct command commands[] = {