mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] scripts/kwbimage: support empty binary.0 files
Date: Mon, 19 Jun 2017 08:17:34 +0200	[thread overview]
Message-ID: <20170619061734.zpqebgend2n2fw5i@pengutronix.de> (raw)
In-Reply-To: <20170613220207.18376-1-u.kleine-koenig@pengutronix.de>

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

      reply	other threads:[~2017-06-19  6:17 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-13 22:02 Uwe Kleine-König
2017-06-19  6:17 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170619061734.zpqebgend2n2fw5i@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=u.kleine-koenig@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox