#include "cbfs.h"
#include "elf.h"
-#define dprintf
+#define dprintf(x...)
uint32_t getfilesize(const char *filename)
{
struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size)
{
struct cbfs_file *nextfile = (struct cbfs_file *)phys_to_virt(physaddr);
- strncpy(nextfile->magic, "LARCHIVE", 8);
+ strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
nextfile->len = htonl(size);
nextfile->type = htonl(0xffffffff);
nextfile->checksum = 0; // FIXME?
uint32_t length = ntohl(thisfile->len);
// Locate the file name
char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
+
// It's not the file we are looking for..
if (strcmp(fname, payloadname) != 0)
{
}
// Else, it's our file.
- printf("Found %.30s payload at 0x%x, type %.12s, size %d\n", fname,
+ printf("Found file %.30s at 0x%x, type %.12s, size %d\n", fname,
current - phys_start, strfiletype(ntohl(thisfile->type)),
length);
+ ntohl(thisfile->offset), length, 1, outfile);
fclose(outfile);
- printf("Successfully dumped the payload.\n");
+ printf("Successfully dumped the file.\n");
// We'll only dump one file.
return 0;
}
-
+ printf("File %s not found.\n", payloadname);
+ return 1;
}
thisfile->len =
htonl(location - current -
ntohl(thisfile->offset));
- struct cbfs_file *nextfile =
- cbfs_create_empty_file(location,
+ cbfs_create_empty_file(location,
length -
(location -
current));
}
memset(newdata, 0xff, *datasize + headersize);
struct cbfs_file *nextfile = (struct cbfs_file *)newdata;
- strncpy(nextfile->magic, "LARCHIVE", 8);
+ strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
nextfile->len = htonl(*datasize);
nextfile->type = htonl(type);
nextfile->checksum = 0; // FIXME?
recalculate_rom_geometry(romarea);
- struct cbfs_file *one_empty_file =
- cbfs_create_empty_file((0 - romsize) & 0xffffffff,
+ cbfs_create_empty_file((0 - romsize) & 0xffffffff,
romsize - bootblocksize -
sizeof(struct cbfs_header) -
sizeof(struct cbfs_file) - 16);
uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
const char *filename, uint32_t alignment)
{
- void *rom = loadrom(romfile);
+ loadrom(romfile);
int filename_size = strlen(filename);
int headersize =