Philipp Deppenwiese merged this change.

View Change

util/cbfstool/ifittool: use strtol function instead of atoi

Fix error "Invalid option -A" by adding "A" to options list.

Also, atoi does not parse hex string, for instance 0x200 is interpreted as 0,
and this causes a failure when updating second FIT table using -j option.
Use strtol instead of atoi

BUG=none
BRANCH=none
TEST=Build and boot hatch after enabling dual bootblock feature.

Change-Id: Ib227437f88ffcccda1ce2f20a9ab098e5aa091c7
Signed-off-by: Pandya, Varshit B <varshit.b.pandya@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33937
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Rizwan Qureshi <rizwan.qureshi@intel.com>
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
---
M util/cbfstool/ifittool.c
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/cbfstool/ifittool.c b/util/cbfstool/ifittool.c
index a83fd96..3b16c3f 100644
--- a/util/cbfstool/ifittool.c
+++ b/util/cbfstool/ifittool.c
@@ -28,7 +28,7 @@
 /* Global variables */
 partitioned_file_t *image_file;
 
-static const char *optstring  = "H:j:f:r:d:t:n:s:caDvh?";
+static const char *optstring  = "H:j:f:r:d:t:n:s:cAaDvh?";
 static struct option long_options[] = {
 	{"file",           required_argument, 0, 'f' },
 	{"region",         required_argument, 0, 'r' },
@@ -230,7 +230,7 @@
 			}
 			break;
 		case 'j':
-			topswap_size = atoi(optarg);
+			topswap_size = strtol(optarg, NULL, 0);
 			if (!is_valid_topswap(topswap_size))
 				return 1;
 			break;

To view, visit change 33937. To unsubscribe, or for help writing mail filters, visit settings.