[src/trunk]: src/sys/arch/i386/stand/efiboot Make "0 seconds" overwrite the c...

[kim <kim%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bb7dd11e464c
branches:  trunk
changeset: 990462:bb7dd11e464c
user:      kim <kim%NetBSD.org@localhost>
date:      Thu Oct 28 06:13:13 2021 +0000

description:
Make "0 seconds" overwrite the countdown also when enter is pressed

Fixes PR misc/56486.

diffstat:

 sys/arch/i386/stand/efiboot/eficons.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r aeb21c2372dd -r bb7dd11e464c sys/arch/i386/stand/efiboot/eficons.c
--- a/sys/arch/i386/stand/efiboot/eficons.c     Thu Oct 28 01:36:43 2021 +0000
+++ b/sys/arch/i386/stand/efiboot/eficons.c     Thu Oct 28 06:13:13 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eficons.c,v 1.11 2020/02/22 10:30:37 jmcneill Exp $    */
+/*     $NetBSD: eficons.c,v 1.12 2021/10/28 06:13:13 kim Exp $ */
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka%netbsd.org@localhost>
@@ -355,7 +355,9 @@
                                c = getchar();
                        if (c == 0)
                                c = -1;
-                       goto out;
+                       if (tell && timeout)
+                               printf("%s", numbuf);
+                       break;
                }
                if (timeout--)
                        internal_waitforinputevent(10000000);
@@ -365,7 +367,6 @@
                        printf("%s", numbuf);
        }
 
-out:
        if (tell)
                printf("0 seconds.     \n");