From: Pali Rohár <pali@kernel.org>
Date: Mon, 7 Feb 2022 09:12:24 +0000 (+0100)
Subject: tools: kwboot: Allow to use -b without image path as the last getopt() option
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=9e6d71d2b55f156c907d073825359d6ae441d9cf;p=u-boot.git

tools: kwboot: Allow to use -b without image path as the last getopt() option

Currently it is possible to call "kwboot -b -t /dev/ttyUSB0" but not to
call "kwboot -b /dev/ttyUSB0".

Fix it by not trying to process the last argv[], which is non-getopt()
option (tty path) as the image path for -b.

Fixes: c513fe47dca2 ("tools: kwboot: Allow to use option -b without image path")
Reported-by: Marcel Ziswiler <marcel@ziswiler.com>
Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marcel Ziswiler <marcel@ziswiler.com>
Tested-by: Marcel Ziswiler <marcel@ziswiler.com>
---

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 7737188f0d..68c0ef1f1b 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -1770,7 +1770,7 @@ main(int argc, char **argv)
 			bootmsg = kwboot_msg_boot;
 			if (prev_optind == optind)
 				goto usage;
-			if (argv[optind] && argv[optind][0] != '-')
+			if (optind < argc - 1 && argv[optind] && argv[optind][0] != '-')
 				imgpath = argv[optind++];
 			break;