Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11361
-gerrit
commit 971bef249b7321b92322cd8a625a4a0ddf23caec Author: Patrick Georgi patrick@georgi-clan.de Date: Wed Aug 26 12:23:26 2015 +0200
cbfstool: factor out parsing compression file attributes
cbfstool extract also needs it.
Change-Id: I8302bb18c5f797eb0a43ec4e4269790f3d49a896 Signed-off-by: Patrick Georgi patrick@georgi-clan.de --- util/cbfstool/cbfs_image.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 5df7d68..64cc07f 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -178,6 +178,26 @@ static void cbfs_decode_payload_segment(struct cbfs_payload_segment *output, assert(seg.size == 0); }
+static int cbfs_file_get_compression_info(struct cbfs_file *entry, + uint32_t *decompressed_size) +{ + unsigned int compression = ntohl(CBFS_COMPRESS_NONE); + *decompressed_size = ntohl(entry->len); + for (struct cbfs_file_attribute *attr = CBFS_FILE_FIRST_ATTR(entry); + attr != NULL; + attr = CBFS_FILE_NEXT_ATTR(entry, attr)) { + if (attr->tag == CBFS_FILE_ATTR_COMPRESSION) { + struct cbfs_file_attr_compression *ac = + (struct cbfs_file_attr_compression *)attr; + compression = ntohl(ac->compression); + if (decompressed_size) + *decompressed_size = + ntohl(ac->decompressed_size); + } + } + return compression; +} + void cbfs_get_header(struct cbfs_header *header, void *src) { struct buffer outheader; @@ -777,18 +797,9 @@ int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry, if (!fp) fp = stdout;
- unsigned int compression = ntohl(CBFS_COMPRESS_NONE); unsigned int decompressed_size = 0; - for (struct cbfs_file_attribute *attr = CBFS_FILE_FIRST_ATTR(entry); - attr != NULL; - attr = CBFS_FILE_NEXT_ATTR(entry, attr)) { - if (attr->tag == CBFS_FILE_ATTR_COMPRESSION) { - struct cbfs_file_attr_compression *ac = - (struct cbfs_file_attr_compression *)attr; - compression = ntohl(ac->compression); - decompressed_size = ntohl(ac->decompressed_size); - } - } + unsigned int compression = cbfs_file_get_compression_info(entry, + &decompressed_size);
if (compression == CBFS_COMPRESS_NONE) { fprintf(fp, "%-30s 0x%-8x %-12s %d\n",