summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-10-27 09:47:49 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2009-10-27 09:47:49 (GMT)
commitd83bbf41934382631161845302f5d77027383aba (patch)
tree9f585364bdc127efc6f93e8f6cd34f502244b0ef
parenteb62d7c383320923e8050a24a725277a1fd5c695 (diff)
downloadbusybox-d83bbf41934382631161845302f5d77027383aba.tar.gz
busybox-d83bbf41934382631161845302f5d77027383aba.tar.bz2
rename sent_ESC_br_n6 variable to sent_ESC_br6n
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--libbb/Config.in2
-rw-r--r--libbb/lineedit.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/libbb/Config.in b/libbb/Config.in
index 60ae0ff..55367b2 100644
--- a/libbb/Config.in
+++ b/libbb/Config.in
@@ -111,7 +111,7 @@ config FEATURE_EDITING_ASK_TERMINAL
current cursor position. This information is used to make line
editing more robust in some cases.
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.
config FEATURE_NON_POSIX_CP
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index b4c3fd3..9c6454d 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -141,7 +141,7 @@ struct lineedit_statics {
CHAR_T delbuf[DELBUFSIZ]; /* a place to store deleted characters */
#endif
#if ENABLE_FEATURE_EDITING_ASK_TERMINAL
- smallint sent_ESC_br_n6;
+ smallint sent_ESC_br6n;
#endif
/* Formerly these were big buffers on stack: */
@@ -409,7 +409,7 @@ static void put_prompt(void)
pfd.fd = STDIN_FILENO;
pfd.events = POLLIN;
if (safe_poll(&pfd, 1, 0) == 0) {
- S.sent_ESC_br_n6 = 1;
+ S.sent_ESC_br6n = 1;
out1str("\033" "[6n");
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 ((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 */
int col = ((ic >> 32) & 0x7fff) - 1;
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) */
#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.
* We sent "ESC [ 6 n", but got '\n' first, and
* KEYCODE_CURSOR_POS response is now buffered from terminal.