[PATCH] scripts/kwbimage: support empty binary.0 files

[PATCH] scripts/kwbimage: support empty binary.0 files

[Uwe Kleine-König]

While it doesn't make sense to use empty binary headers on a machine for
first stage, it is convenient to support this for build testing.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 scripts/kwbimage.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/kwbimage.c b/scripts/kwbimage.c
index 5b84db3f7a23..2a052a7ff385 100644
--- a/scripts/kwbimage.c
+++ b/scripts/kwbimage.c
@@ -967,7 +967,11 @@ static void *image_create_v1(struct image_cfg_element *image_cfg,
 
 		cur += (binarye->binary.nargs + 1) * sizeof(unsigned int);
 
-		ret = fread(cur, s.st_size, 1, bin);
+		if (s.st_size)
+			ret = fread(cur, s.st_size, 1, bin);
+		else
+			ret = 1;
+
 		if (ret != 1) {
 			fprintf(stderr,
 				"Could not read binary image %s\n",
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] scripts/kwbimage: support empty binary.0 files

[Sascha Hauer]

On Wed, Jun 14, 2017 at 12:02:07AM +0200, Uwe Kleine-König wrote:
> While it doesn't make sense to use empty binary headers on a machine for
> first stage, it is convenient to support this for build testing.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  scripts/kwbimage.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/scripts/kwbimage.c b/scripts/kwbimage.c
> index 5b84db3f7a23..2a052a7ff385 100644
> --- a/scripts/kwbimage.c
> +++ b/scripts/kwbimage.c
> @@ -967,7 +967,11 @@ static void *image_create_v1(struct image_cfg_element *image_cfg,
>  
>  		cur += (binarye->binary.nargs + 1) * sizeof(unsigned int);
>  
> -		ret = fread(cur, s.st_size, 1, bin);
> +		if (s.st_size)
> +			ret = fread(cur, s.st_size, 1, bin);
> +		else
> +			ret = 1;
> +
>  		if (ret != 1) {
>  			fprintf(stderr,
>  				"Could not read binary image %s\n",
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox