diff options
author | Pali Rohár <pali@kernel.org> | 2022-02-07 10:12:24 +0100 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2022-02-10 07:12:16 +0100 |
commit | 9e6d71d2b55f156c907d073825359d6ae441d9cf (patch) | |
tree | de5404b159169d5766ffbc8bc6741ba17aa8d01e | |
parent | c153576d8dfc80c651a7edb046adbaa1c1c17e42 (diff) | |
download | u-boot-9e6d71d2b55f156c907d073825359d6ae441d9cf.zip u-boot-9e6d71d2b55f156c907d073825359d6ae441d9cf.tar.gz u-boot-9e6d71d2b55f156c907d073825359d6ae441d9cf.tar.bz2 |
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>
-rw-r--r-- | tools/kwboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/kwboot.c b/tools/kwboot.c index 7737188..68c0ef1 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; |