Module Name: src
Committed By: kim
Date: Thu Oct 28 06:13:13 UTC 2021
Modified Files:
src/sys/arch/i386/stand/efiboot: eficons.c
Log Message:
Make "0 seconds" overwrite the countdown also when enter is pressed
Fixes PR misc/56486.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/stand/efiboot/eficons.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/efiboot/eficons.c
diff -u src/sys/arch/i386/stand/efiboot/eficons.c:1.11 src/sys/arch/i386/stand/efiboot/eficons.c:1.12
--- src/sys/arch/i386/stand/efiboot/eficons.c:1.11 Sat Feb 22 10:30:37 2020
+++ src/sys/arch/i386/stand/efiboot/eficons.c Thu Oct 28 06:13:13 2021
@@ -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 <non...@netbsd.org>
@@ -355,7 +355,9 @@ awaitkey(int timeout, int tell)
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 @@ awaitkey(int timeout, int tell)
printf("%s", numbuf);
}
-out:
if (tell)
printf("0 seconds. \n");
