Changeset 3691

Timestamp:

10/23/08 14:22:24 (3 months ago)

Author:

oxygene

Message:

make escape code handling for serial terminal more robust

Signed-off-by: Patrick Georgi <patrick.georgi@…>
Acked-by: Marc Jones <marc.jones@…>

Files:

• trunk/payloads/libpayload/curses/keyboard.c (modified) (2 diffs)

trunk/payloads/libpayload/curses/keyboard.c

@@ -51 +51 @@
    pass it to dedicated vt100 code */
 
-static int getkeyseq(char *buffer, int len)
+static int getkeyseq(char *buffer, int len, int max)
 {
         int i;
 
-        for(i = 0; i < 75; i++) {
-                if (serial_havechar())
-                        break;
-                mdelay(1);
+        while (1) {
+                for(i = 0; i < 75; i++) {
+                        if (serial_havechar())
+                                break;
+                        mdelay(1);
+                }
+
+                if (i == 75)
+                        return len;
+
+                buffer[len++] = serial_getchar();
+                if (len == max)
+                        return len;
         }
-
-        if (i == 75)
-                return len;
-
-        buffer[len++] = serial_getchar();
-        return getkeyseq(buffer, len);
 }
 
@@ -100 +103 @@
 {
         char buffer[5];
-        int len = getkeyseq(buffer, 0);
+        int len = getkeyseq(buffer, 0, sizeof(buffer));
         int i, t;