emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read_key,lineeedit: parse position answerback faster; sanitize its use

Browse Source 
it's still not reliable, and probably cannot be made so...
added comment with explanation.

function                                             old     new   delta
put_prompt                                            52     110     +58
read_key                                             601     607      +6
lineedit_read_key                                    201     207      +6
win_changed                                          108     104      -4
read_line_input                                     4824    4809     -15
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/2 up/down: 70/-19)             Total: 51 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2009-10-26 15:23:32 +01:00
parent d31a8793eb
commit 727e1b536e
2 changed files with 58 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
libbb/read_key.c
View File

@@ -202,6 +202,31 @@ int64_t FAST_FUNC read_key(int fd, char *buffer)
break;
}
n++;
/* Try to decipher "ESC [ NNN ; NNN R" sequence */
if (ENABLE_FEATURE_EDITING_ASK_TERMINAL
&& n >= 5
&& buffer[0] == '['
&& buffer[n-1] == 'R'
&& isdigit(buffer[1])
) {
char *end;
unsigned long row, col;
row = strtoul(buffer + 1, &end, 10);
if (*end != ';' || !isdigit(end[1]))
continue;
col = strtoul(end + 1, &end, 10);
if (*end != 'R')
continue;
if (row < 1 || col < 1 || (row | col) > 0x7fff)
continue;
buffer[-1] = 0;
/* Pack into "1 <row15bits> <col16bits>" 32-bit sequence */
col |= (((-1 << 15) | row) << 16);
/* Return it in high-order word */
return ((int64_t) col << 32) | (uint32_t)KEYCODE_CURSOR_POS;
}
}
got_all:
@@ -213,34 +238,6 @@ int64_t FAST_FUNC read_key(int fd, char *buffer)
return 27;
}
/* Try to decipher "ESC [ NNN ; NNN R" sequence */
if (ENABLE_FEATURE_EDITING_ASK_TERMINAL
&& n >= 5
&& buffer[0] == '['
&& isdigit(buffer[1])
&& buffer[n-1] == 'R'
) {
char *end;
unsigned long row, col;
row = strtoul(buffer + 1, &end, 10);
if (*end != ';' || !isdigit(end[1]))
goto not_R;
col = strtoul(end + 1, &end, 10);
if (*end != 'R')
goto not_R;
if (row < 1 || col < 1 || (row | col) > 0x7fff)
goto not_R;
buffer[-1] = 0;
/* Pack into "1 <row15bits> <col16bits>" 32-bit sequence */
col |= (((-1 << 15) | row) << 16);
/* Return it in high-order word */
return ((int64_t) col << 32) | (uint32_t)KEYCODE_CURSOR_POS;
}
not_R:
/* We were doing "buffer[-1] = n; return c;" here, but this results
* in unknown key sequences being interpreted as ESC + garbage.
* This was not useful. Pretend there was no key pressed,