mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 2/2] scripts: imx-image: make read_file behaviour consistent
Date: Tue,  5 Feb 2019 09:59:01 +0100	[thread overview]
Message-ID: <20190205085901.2271-2-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20190205085901.2271-1-s.hauer@pengutronix.de>

When read_file fails then it exits the program in most cases. Let's exit
the program when stat() fails aswell, so that we *always* exit the
program on failure. Drop all error handling for read_file since that's
no longer necessary and rename the function to xread_file to make
clear it won't fail.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 scripts/imx/imx-image.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index 4933703fdc..a7f1421fa3 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -694,7 +694,7 @@ static int hab_sign(struct config_data *data)
 	return 0;
 }
 
-static void *read_file(const char *filename, size_t *size)
+static void *xread_file(const char *filename, size_t *size)
 {
 	int fd, ret;
 	void *buf;
@@ -707,13 +707,17 @@ static void *read_file(const char *filename, size_t *size)
 	}
 
 	ret = fstat(fd, &s);
-	if (ret)
-		return NULL;
+	if (ret) {
+		fprintf(stderr, "Cannot stat %s: %s\n", filename, strerror(errno));
+		exit(1);
+	}
 
 	*size = s.st_size;
 	buf = malloc(*size);
-	if (!buf)
+	if (!buf) {
+		perror("malloc");
 		exit(1);
+	}
 
 	xread(fd, buf, *size);
 
@@ -884,12 +888,8 @@ int main(int argc, char *argv[])
 
 		if (data.signed_hdmi_firmware_file) {
 			free(buf);
-			buf = read_file(data.signed_hdmi_firmware_file,
+			buf = xread_file(data.signed_hdmi_firmware_file,
 					&signed_hdmi_firmware_size);
-			if (!buf) {
-				perror("read_file");
-				exit(1);
-			}
 
 			signed_hdmi_firmware_size =
 				roundup(signed_hdmi_firmware_size,
@@ -931,9 +931,7 @@ int main(int argc, char *argv[])
 	bb_header[0] = data.first_opcode;
 	bb_header[ARM_HEAD_SIZE_INDEX] = barebox_image_size;
 
-	infile = read_file(imagename, &insize);
-	if (!infile)
-		exit(1);
+	infile = xread_file(imagename, &insize);
 
 	outfd = open(data.outfile, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
 	if (outfd < 0) {
@@ -998,7 +996,7 @@ int main(int argc, char *argv[])
 	if (create_usb_image) {
 		uint32_t *dcd;
 
-		infile = read_file(data.outfile, &insize);
+		infile = xread_file(data.outfile, &insize);
 
 		dcd = infile + dcd_ptr_offset;
 		*dcd = dcd_ptr_content;
-- 
2.20.1


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

      reply	other threads:[~2019-02-05  8:59 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-05  8:59 [PATCH 1/2] scripts: imx-image: Be more informative on open errors Sascha Hauer
2019-02-05  8:59 ` 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=20190205085901.2271-2-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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