From 55745deaf434a832ecb49daf261b1e6300e4eb13 Mon Sep 17 00:00:00 2001 From: Evan Lloyd Date: Fri, 13 Jan 2017 14:13:09 +0000 Subject: fiptool: Update file open modes with 'b' (for Windows) Unix does not distinguish binary and text modes. On Windows the 'b' flag (e.g. "rb" instead of "r") is used to indicate that files should be opened in binary mode. This has no impact on Unix, but is needed on Windows to avoid end-of-line issues. Change-Id: I69424c55735d5d563d36c50bedd6357b8e05137e Signed-off-by: Evan Lloyd --- tools/fiptool/fiptool.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/fiptool/fiptool.c b/tools/fiptool/fiptool.c index 4d80f2f1..02223d99 100644 --- a/tools/fiptool/fiptool.c +++ b/tools/fiptool/fiptool.c @@ -285,7 +285,7 @@ static int parse_fip(const char *filename, fip_toc_header_t *toc_header_out) fip_toc_entry_t *toc_entry; int terminated = 0; - fp = fopen(filename, "r"); + fp = fopen(filename, "rb"); if (fp == NULL) log_err("fopen %s", filename); @@ -376,7 +376,7 @@ static image_t *read_image_from_file(const uuid_t *uuid, const char *filename) assert(uuid != NULL); - fp = fopen(filename, "r"); + fp = fopen(filename, "rb"); if (fp == NULL) log_err("fopen %s", filename); @@ -398,7 +398,7 @@ static int write_image_to_file(const image_t *image, const char *filename) { FILE *fp; - fp = fopen(filename, "w"); + fp = fopen(filename, "wb"); if (fp == NULL) log_err("fopen"); xfwrite(image->buffer, image->toc_e.size, fp, filename); @@ -534,7 +534,7 @@ static int pack_images(const char *filename, uint64_t toc_flags, unsigned long a toc_entry->offset_address = entry_offset; /* Generate the FIP file. */ - fp = fopen(filename, "w"); + fp = fopen(filename, "wb"); if (fp == NULL) log_err("fopen %s", filename); -- cgit v1.2.3