[syslinux:elflink] ldlinux: Don't return NULL on KEY_ESC.

syslinux-bot for Matt Fleming matt.fleming at intel.com
Mon Nov 26 05:27:03 PST 2012


Commit-ID:  b8dfe78a33e70f657f8aadb48de644a92bf82850
Gitweb:     http://www.syslinux.org/commit/b8dfe78a33e70f657f8aadb48de644a92bf82850
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Thu, 15 Nov 2012 19:46:54 +0000
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Mon, 26 Nov 2012 12:34:13 +0000

ldlinux: Don't return NULL on KEY_ESC.

The old command line code in 4.06 ignores KEY_ESC and KEY_CTRL('C') so
we should do the same. What currently happens if a user hits ESC is
that we return from edit_cmdline() as though we'd timed out waiting
for user input.

Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 com32/elflink/ldlinux/cli.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/com32/elflink/ldlinux/cli.c b/com32/elflink/ldlinux/cli.c
index d876895..6d03f16 100644
--- a/com32/elflink/ldlinux/cli.c
+++ b/com32/elflink/ldlinux/cli.c
@@ -215,12 +215,6 @@ const char *edit_cmdline(const char *input, int top /*, int width */ ,
 	    done = true;
 	    break;
 
-	case KEY_ESC:
-	case KEY_CTRL('C'):
-	    ret = NULL;
-	    done = true;
-	    break;
-
 	case KEY_BACKSPACE:
 	case KEY_DEL:
 	    if (cursor) {


More information about the Syslinux-commits mailing list