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

rename sent_ESC_br_n6 variable to sent_ESC_br6n

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-10-27 10:47:49 +01:00
parent eb62d7c383
commit d83bbf4193
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libbb/Config.in
View File

@ -111,7 +111,7 @@ config FEATURE_EDITING_ASK_TERMINAL
current cursor position. This information is used to make line current cursor position. This information is used to make line
editing more robust in some cases. editing more robust in some cases.
If you are not sure whether your terminals respond to this code If you are not sure whether your terminals respond to this code
correctly, or want to save on code size (about 300 bytes), correctly, or want to save on code size (about 400 bytes),
then do not turn this option on. then do not turn this option on.
config FEATURE_NON_POSIX_CP config FEATURE_NON_POSIX_CP

10
libbb/lineedit.c
View File

@ -141,7 +141,7 @@ struct lineedit_statics {
CHAR_T delbuf[DELBUFSIZ]; /* a place to store deleted characters */ CHAR_T delbuf[DELBUFSIZ]; /* a place to store deleted characters */
#endif #endif
#if ENABLE_FEATURE_EDITING_ASK_TERMINAL #if ENABLE_FEATURE_EDITING_ASK_TERMINAL
smallint sent_ESC_br_n6; smallint sent_ESC_br6n;
#endif #endif
/* Formerly these were big buffers on stack: */ /* Formerly these were big buffers on stack: */
@ -409,7 +409,7 @@ static void put_prompt(void)
pfd.fd = STDIN_FILENO; pfd.fd = STDIN_FILENO;
pfd.events = POLLIN; pfd.events = POLLIN;
if (safe_poll(&pfd, 1, 0) == 0) { if (safe_poll(&pfd, 1, 0) == 0) {
S.sent_ESC_br_n6 = 1; S.sent_ESC_br6n = 1;
out1str("\033" "[6n"); out1str("\033" "[6n");
fflush(NULL); /* make terminal see it ASAP! */ fflush(NULL); /* make terminal see it ASAP! */
} }
@ -1674,9 +1674,9 @@ static int lineedit_read_key(char *read_key_buffer)
#if ENABLE_FEATURE_EDITING_ASK_TERMINAL #if ENABLE_FEATURE_EDITING_ASK_TERMINAL
if ((int32_t)ic == KEYCODE_CURSOR_POS if ((int32_t)ic == KEYCODE_CURSOR_POS
&& S.sent_ESC_br_n6 && S.sent_ESC_br6n
) { ) {
S.sent_ESC_br_n6 = 0; S.sent_ESC_br6n = 0;
if (cursor == 0) { /* otherwise it may be bogus */ if (cursor == 0) { /* otherwise it may be bogus */
int col = ((ic >> 32) & 0x7fff) - 1; int col = ((ic >> 32) & 0x7fff) - 1;
if (col > cmdedit_prmt_len) { if (col > cmdedit_prmt_len) {
@ -2203,7 +2203,7 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
} /* while (1) */ } /* while (1) */
#if ENABLE_FEATURE_EDITING_ASK_TERMINAL #if ENABLE_FEATURE_EDITING_ASK_TERMINAL
if (S.sent_ESC_br_n6) { if (S.sent_ESC_br6n) {
/* "sleep 1; busybox ash" + hold [Enter] to trigger. /* "sleep 1; busybox ash" + hold [Enter] to trigger.
* We sent "ESC [ 6 n", but got '\n' first, and * We sent "ESC [ 6 n", but got '\n' first, and
* KEYCODE_CURSOR_POS response is now buffered from terminal. * KEYCODE_CURSOR_POS response is now buffered from terminal.