[src/netbsd-8]: src/sys/arch/i386/stand/efiboot Pull up following revision(s)...

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

details:   https://anonhg.NetBSD.org/src/rev/4dd5dd08aaef
branches:  netbsd-8
changeset: 435004:4dd5dd08aaef
user:      martin <martin%NetBSD.org@localhost>
date:      Tue May 22 17:43:21 2018 +0000

description:
Pull up following revision(s) (requested by jakllsch in ticket #831):

        sys/arch/i386/stand/efiboot/eficons.c: revision 1.6

During awaitkey(), move the cursor back to the beginning of the
countdown with '\b' only after waiting.

Some UEFI implementations have a destructive/erasing backspace,
and will not show the countdown if we move the cursor back before the
wait.

My ThinkPad T430 w/ Lenovo's UEFI exhibited this whiteout-backspace,
while my Gigabyte Brix GB-BXBT-2807 did not.

Should fix PR #53292.

diffstat:

 sys/arch/i386/stand/efiboot/eficons.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 8f6e0f8d1d1f -r 4dd5dd08aaef sys/arch/i386/stand/efiboot/eficons.c
--- a/sys/arch/i386/stand/efiboot/eficons.c     Tue May 22 17:41:12 2018 +0000
+++ b/sys/arch/i386/stand/efiboot/eficons.c     Tue May 22 17:43:21 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eficons.c,v 1.4.2.1 2018/04/02 08:50:33 martin Exp $   */
+/*     $NetBSD: eficons.c,v 1.4.2.2 2018/05/22 17:43:21 martin Exp $   */
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka%netbsd.org@localhost>
@@ -328,10 +328,10 @@
        char c = 0;
 
        for (;;) {
+               char numbuf[32];
+               int len;
+
                if (tell && timeout) {
-                       char numbuf[32];
-                       int len;
-
                        len = snprintf(numbuf, sizeof(numbuf), "%d seconds. ",
                            timeout);
                        if (len > 0 && len < sizeof(numbuf)) {
@@ -340,7 +340,6 @@
                                printf("%s", numbuf);
                                while (*p)
                                        *p++ = '\b';
-                               printf("%s", numbuf);
                        }
                }
                if (iskey(1)) {
@@ -355,6 +354,8 @@
                        internal_waitforinputevent(10000000);
                else
                        break;
+               if (tell)
+                       printf("%s", numbuf);
        }
 
 out: