aboutsummaryrefslogtreecommitdiffstats
path: root/com32/elflink/ldlinux/cli.c
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-11-21 21:03:24 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-11-26 12:33:58 +0000
commit4e140a59517f79bf593bec0f5a80810aa877f3ed (patch)
tree994d2cc793626f372397fc945bdd79b0ccbe56c7 /com32/elflink/ldlinux/cli.c
parent348ae6af01350a9a46f3076a2facd27918f0f603 (diff)
downloadsyslinux-4e140a59517f79bf593bec0f5a80810aa877f3ed.tar.gz
syslinux-4e140a59517f79bf593bec0f5a80810aa877f3ed.tar.xz
syslinux-4e140a59517f79bf593bec0f5a80810aa877f3ed.zip
ldlinux: Never exit from ldlinux.c32
If there's no DEFAULT directive in the config file and the user hits the ENTER key enough times, or we timeout waiting for input, ldlinux.c32 will exit. This should never be allowed to happen, and we need to keep doing the ldlinux_auto_boot()/boot prompt dance. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'com32/elflink/ldlinux/cli.c')
-rw-r--r--com32/elflink/ldlinux/cli.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/com32/elflink/ldlinux/cli.c b/com32/elflink/ldlinux/cli.c
index ebeaeece..d876895c 100644
--- a/com32/elflink/ldlinux/cli.c
+++ b/com32/elflink/ldlinux/cli.c
@@ -119,7 +119,7 @@ static const char * cmd_reverse_search(int *cursor, clock_t *kbd_to,
const char *edit_cmdline(const char *input, int top /*, int width */ ,
int (*pDraw_Menu) (int, int, int),
- void (*show_fkey) (int))
+ void (*show_fkey) (int), bool *timedout)
{
static char cmdline[MAX_CMDLINE_LEN];
char temp_cmdline[MAX_CMDLINE_LEN] = { };
@@ -202,6 +202,7 @@ const char *edit_cmdline(const char *input, int top /*, int width */ ,
switch (key) {
case KEY_NONE:
/* We timed out. */
+ *timedout = true;
return NULL;
case KEY_CTRL('L'):