[U-Boot-Users] [PATCH] Fix control-c handing in CONFIG_CMDLINE_EDITING

31 Jul 2006

Properly pass break code back from readline.
-roger blofeld

diff --git a/common/main.c b/common/main.c
index 3788bd5..13d12a4 100644
--- a/common/main.c
+++ b/common/main.c
@@ -937,6 +937,7 @@ int readline (const char *const prompt)
 #ifdef CONFIG_CMDLINE_EDITING
    char *p = console_buffer;
    unsigned int len=MAX_CMDBUF_SIZE;
+	int rc;
    static int initted = 0;
if (!initted) {
@@ -946,8 +947,8 @@ #ifdef CONFIG_CMDLINE_EDITING
puts (prompt);
-	cread_line(p, &len);
-	return len;
+	rc = cread_line(p, &len);
+	return rc < 0 ? rc : len;
 #else
    char   *p = console_buffer;
    int	n = 0;				/* buffer index		*/
__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com
diff --git a/common/main.c b/common/main.c
index 3788bd5..13d12a4 100644
--- a/common/main.c
+++ b/common/main.c
@@ -937,6 +937,7 @@ int readline (const char *const prompt)
 #ifdef CONFIG_CMDLINE_EDITING
    char *p = console_buffer;
    unsigned int len=MAX_CMDBUF_SIZE;
+	int rc;
    static int initted = 0;
if (!initted) {
@@ -946,8 +947,8 @@ #ifdef CONFIG_CMDLINE_EDITING
puts (prompt);
-	cread_line(p, &len);
-	return len;
+	rc = cread_line(p, &len);
+	return rc < 0 ? rc : len;
 #else
    char   *p = console_buffer;
    int	n = 0;				/* buffer index		*/

    

roger blofeld