From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 7 May 2015 18:29:19 +0000 (+0300)
Subject: menu: Return an error code if Ctrl-C is pressed
X-Git-Tag: v2015.07-rc2~84
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9b081d8893c4fce3451e3a5a4d5ac5a9960874ae;p=oweals%2Fu-boot.git

menu: Return an error code if Ctrl-C is pressed

Previously, if the menu activated by the 'sysboot' command gets
interrupted by a Ctrl-C, the behaviour is as if the menu timeout was
reached - i.e. boot the default menu entry. This patch fixes that
so a Ctrl-C now terminates the command as the user would expect.

Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/menu.c b/common/menu.c
index e81c074f36..eda96d68bc 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -202,6 +202,9 @@ static inline int menu_interactive_choice(struct menu *m, void **choice)
 				choice_item = menu_item_by_key(m, cbuf);
 				if (!choice_item)
 					printf("%s not found\n", cbuf);
+			} else if (readret == -1)  {
+				printf("<INTERRUPT>\n");
+				return -EINTR;
 			} else {
 				return menu_default_choice(m, choice);
 			}