mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Aleksander Morgado <aleksander@aleksander.es>
To: barebox@lists.infradead.org
Cc: Aleksander Morgado <aleksander@aleksander.es>
Subject: [PATCH] console_countdown: ignore errors in getchar()
Date: Wed, 20 Sep 2017 12:07:16 -0700	[thread overview]
Message-ID: <20170920190716.25768-1-aleksander@aleksander.es> (raw)

The getchar() call may return an error reported as a -1, e.g. when the
console detects a RATP message and switches to RATP mode.

In general it probably is a good idea to ignore these errors in the
console countdown operation; and in particular for the RATP usecase,
this also prevents from interfering with the countdown and menu just
when switching one of the consoles to RATP mode.

As a hint, this is what the standard console was printing due to this
issue when the RATP console was activated:

   Hit m for menu or any other key to stop autoboot: [: missing `]'

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
---
 common/console_countdown.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/common/console_countdown.c b/common/console_countdown.c
index 03b9b3353..36da1ce57 100644
--- a/common/console_countdown.c
+++ b/common/console_countdown.c
@@ -47,12 +47,14 @@ int console_countdown(int timeout_s, unsigned flags, char *out_key)
 	do {
 		if (tstc()) {
 			key = getchar();
-			if (flags & CONSOLE_COUNTDOWN_ANYKEY)
-				goto out;
-			if (flags & CONSOLE_COUNTDOWN_RETURN && key == '\n')
-				goto out;
-			if (flags & CONSOLE_COUNTDOWN_CTRLC && key == 3)
-				goto out;
+			if (key >= 0) {
+				if (flags & CONSOLE_COUNTDOWN_ANYKEY)
+					goto out;
+				if (flags & CONSOLE_COUNTDOWN_RETURN && key == '\n')
+					goto out;
+				if (flags & CONSOLE_COUNTDOWN_CTRLC && key == 3)
+					goto out;
+			}
 			key = 0;
 		}
 		if ((flags & CONSOLE_COUNTDOWN_EXTERN) &&
-- 
2.14.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2017-09-20 19:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-20 19:07 Aleksander Morgado [this message]
2017-09-26  6:48 ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170920190716.25768-1-aleksander@aleksander.es \
    --to=aleksander@aleksander.es \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox