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

cbfstool: Add helper function buffer_from_file_aligned_size

Browse Source 
This change adds a helper function `buffer_from_file_aligned_size`
that loads a file into memory buffer by creating a memory buffer of
size rounded up to the provided `size_granularity` parameter.

BUG=b:189177186,b:189167923

Change-Id: Iad3430d476abcdad850505ac50e36cd5d5deecb4
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55989
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
This commit is contained in:
Furquan Shaikh 2021-06-25 23:55:51 -07:00
parent 967730f565
commit 2bfef8d856
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
util/cbfstool/common.c
View File

@ -49,7 +49,8 @@ int buffer_create(struct buffer *buffer, size_t size, const char *name)
return (buffer->data == NULL); return (buffer->data == NULL);
} }
int buffer_from_file(struct buffer *buffer, const char *filename) int buffer_from_file_aligned_size(struct buffer *buffer, const char *filename,
size_t size_granularity)
{ {
FILE *fp = fopen(filename, "rb"); FILE *fp = fopen(filename, "rb");
if (!fp) { if (!fp) {
@ -63,20 +64,29 @@ int buffer_from_file(struct buffer *buffer, const char *filename)
fclose(fp); fclose(fp);
return -1; return -1;
} }
buffer->size = file_size; buffer->size = ALIGN_UP(file_size, size_granularity);
buffer->name = strdup(filename); buffer->name = strdup(filename);
buffer->data = (char *)malloc(buffer->size); buffer->data = (char *)malloc(buffer->size);
assert(buffer->data); assert(buffer->data);
if (fread(buffer->data, 1, buffer->size, fp) != buffer->size) { if (fread(buffer->data, 1, file_size, fp) != (size_t)file_size) {
fprintf(stderr, "incomplete read: %s\n", filename); fprintf(stderr, "incomplete read: %s\n", filename);
fclose(fp); fclose(fp);
buffer_delete(buffer); buffer_delete(buffer);
return -1; return -1;
} }
fclose(fp); fclose(fp);
if (buffer->size > (size_t)file_size)
memset(buffer->data + file_size, 0xff, buffer->size - file_size);
return 0; return 0;
} }
int buffer_from_file(struct buffer *buffer, const char *filename)
{
return buffer_from_file_aligned_size(buffer, filename, 1);
}
int buffer_write_file(struct buffer *buffer, const char *filename) int buffer_write_file(struct buffer *buffer, const char *filename)
{ {
FILE *fp = fopen(filename, "wb"); FILE *fp = fopen(filename, "wb");

5
util/cbfstool/common.h
View File

@ -132,6 +132,11 @@ int buffer_create(struct buffer *buffer, size_t size, const char *name);
/* Loads a file into memory buffer. Returns 0 on success, otherwise non-zero. */ /* Loads a file into memory buffer. Returns 0 on success, otherwise non-zero. */
int buffer_from_file(struct buffer *buffer, const char *filename); int buffer_from_file(struct buffer *buffer, const char *filename);
/* Loads a file into memory buffer (with buffer size rounded up to a multiple of
size_granularity). Returns 0 on success, otherwise non-zero. */
int buffer_from_file_aligned_size(struct buffer *buffer, const char *filename,
size_t size_granularity);
/* Writes memory buffer content into file. /* Writes memory buffer content into file.
* Returns 0 on success, otherwise non-zero. */ * Returns 0 on success, otherwise non-zero. */
int buffer_write_file(struct buffer *buffer, const char *filename); int buffer_write_file(struct buffer *buffer, const char *filename);