sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More error checking when trying to open files in

Browse Source 
cbfstool. (trivial)

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4634 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi
2009-09-15 08:21:46 +00:00
parent fd9c9b8ff8
commit 45d8a83b29
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
util/cbfstool/cbfstool.c
View File

@ -57,6 +57,10 @@ int main(int argc, char **argv)
} }
void *rom = loadrom(romname); void *rom = loadrom(romname);
if (rom == NULL) {
printf("Could not load ROM image '%s'.\n", romname);
return 1;
}
if (strcmp(cmd, "print") == 0) { if (strcmp(cmd, "print") == 0) {
print_cbfs_directory(romname); print_cbfs_directory(romname);
@ -68,11 +72,15 @@ int main(int argc, char **argv)
return 1; return 1;
} }
void *filename = argv[3]; char *filename = argv[3];
void *cbfsname = argv[4]; char *cbfsname = argv[4];
uint32_t filesize = 0; uint32_t filesize = 0;
void *filedata = loadfile(filename, &filesize, 0, SEEK_SET); void *filedata = loadfile(filename, &filesize, 0, SEEK_SET);
if (filedata == NULL) {
printf("Could not load file '%s'.\n", filename);
return 1;
}
uint32_t base = 0; uint32_t base = 0;
void *cbfsfile; void *cbfsfile;

4
util/cbfstool/common.c
View File

@ -31,6 +31,8 @@ void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
int place) int place)
{ {
FILE *file = fopen(filename, "rb"); FILE *file = fopen(filename, "rb");
if (file == NULL)
return NULL;
fseek(file, 0, SEEK_END); fseek(file, 0, SEEK_END);
*romsize_p = ftell(file); *romsize_p = ftell(file);
fseek(file, 0, SEEK_SET); fseek(file, 0, SEEK_SET);
@ -65,6 +67,8 @@ void recalculate_rom_geometry(void *romarea)
void *loadrom(const char *filename) void *loadrom(const char *filename)
{ {
void *romarea = loadfile(filename, &romsize, 0, SEEK_SET); void *romarea = loadfile(filename, &romsize, 0, SEEK_SET);
if (romarea == NULL)
return NULL;
recalculate_rom_geometry(romarea); recalculate_rom_geometry(romarea);
return romarea; return romarea;
} }