]> git.baikalelectronics.ru Git - uboot.git/commitdiff
tools: kwboot: Fix printing progress
authorPali Rohár <pali@kernel.org>
Fri, 24 Sep 2021 21:06:46 +0000 (23:06 +0200)
committerStefan Roese <sr@denx.de>
Fri, 1 Oct 2021 09:07:13 +0000 (11:07 +0200)
Ensure that `pos` is still in range up to the `width` so printing 100%
works also for bigger images. After printing 100% progress reset it to
zero, so that next progressbar can be started.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
tools/kwboot.c

index 3d9f73e697e0502520136590d66d24596b6df5bb..eb4b3fe2305b600608fb3828b4e3c1120fdcf88c 100644 (file)
@@ -140,12 +140,14 @@ __progress(int pct, char c)
        fputc(c, stdout);
 
        nl = "]\n";
-       pos++;
+       pos = (pos + 1) % width;
 
        if (pct == 100) {
-               while (pos++ < width)
+               while (pos && pos++ < width)
                        fputc(' ', stdout);
                fputs(nl, stdout);
+               nl = "";
+               pos = 0;
        }
 
        fflush(stdout);
@@ -162,6 +164,9 @@ kwboot_progress(int _pct, char c)
 
        if (kwboot_verbose)
                __progress(pct, c);
+
+       if (pct == 100)
+               pct = 0;
 }
 
 static int