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: c513fe47dc ("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>
This commit is contained in:
Pali Rohár 2022-02-07 10:12:24 +01:00 committed by Stefan Roese
parent c153576d8d
commit 9e6d71d2b5

View file

@ -1770,7 +1770,7 @@ main(int argc, char **argv)
bootmsg = kwboot_msg_boot; bootmsg = kwboot_msg_boot;
if (prev_optind == optind) if (prev_optind == optind)
goto usage; goto usage;
if (argv[optind] && argv[optind][0] != '-') if (optind < argc - 1 && argv[optind] && argv[optind][0] != '-')
imgpath = argv[optind++]; imgpath = argv[optind++];
break; break;