From 3dc133915f876c478d01dbc29a5b70e5da075352 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Tue, 9 Apr 2019 19:03:34 +0200 Subject: [PATCH] mktplinkfw2: show exact exceed bytes when the image is to big When an image is too big it's useful to show how many bytes the image is to big. Signed-off-by: Alexander Couzens --- src/mktplinkfw2.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/mktplinkfw2.c b/src/mktplinkfw2.c index e5981ef..e00e13c 100644 --- a/src/mktplinkfw2.c +++ b/src/mktplinkfw2.c @@ -218,6 +218,7 @@ static void usage(int status) static int check_options(void) { int ret; + int exceed_bytes; if (inspect_info.file_name) { ret = get_file_stat(&inspect_info); @@ -311,21 +312,24 @@ static int check_options(void) DBG("rootfs offset aligned to 0x%u", rootfs_ofs); - if (kernel_len + rootfs_info.file_size > - layout->fw_max_len - sizeof(struct fw_header)) { - ERR("images are too big"); + exceed_bytes = (kernel_len + rootfs_info.file_size) - + (layout->fw_max_len - sizeof(struct fw_header)); + if (exceed_bytes > 0) { + ERR("images are too big by %i bytes", exceed_bytes); return -1; } } else { - if (kernel_info.file_size > - rootfs_ofs - sizeof(struct fw_header)) { - ERR("kernel image is too big"); + exceed_bytes = kernel_info.file_size - + (rootfs_ofs - sizeof(struct fw_header)); + if (exceed_bytes > 0) { + ERR("images are too big by %i bytes", exceed_bytes); return -1; } - if (rootfs_info.file_size > - (layout->fw_max_len - rootfs_ofs)) { - ERR("rootfs image is too big"); + exceed_bytes = rootfs_info.file_size - + (layout->fw_max_len - rootfs_ofs); + if (exceed_bytes > 0) { + ERR("images are too big by %i bytes", exceed_bytes); return -1; } } -- 2.30.2