diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-05-29 10:39:06 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-05-29 10:39:06 +0200 |
commit | 4b7db4f2ca232c630e334fa56b1eb89848d5fcc5 (patch) | |
tree | 55608587f33fc1d6f6a8e40dfdf7fea66c750d7a /libbb/read_key.c | |
parent | 171932d7ca62dbb0e0b84a0919e1f3a8a68f03f2 (diff) | |
download | busybox-w32-4b7db4f2ca232c630e334fa56b1eb89848d5fcc5.tar.gz busybox-w32-4b7db4f2ca232c630e334fa56b1eb89848d5fcc5.tar.bz2 busybox-w32-4b7db4f2ca232c630e334fa56b1eb89848d5fcc5.zip |
read_key: drop optimization where we read 3 bytes at once
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb/read_key.c')
-rw-r--r-- | libbb/read_key.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libbb/read_key.c b/libbb/read_key.c index 3771045d2..6f6c39e45 100644 --- a/libbb/read_key.c +++ b/libbb/read_key.c | |||
@@ -69,11 +69,14 @@ int64_t FAST_FUNC read_key(int fd, char *buffer) | |||
69 | errno = 0; | 69 | errno = 0; |
70 | n = (unsigned char) *buffer++; | 70 | n = (unsigned char) *buffer++; |
71 | if (n == 0) { | 71 | if (n == 0) { |
72 | /* If no data, block waiting for input. If we read more | 72 | /* If no data, block waiting for input. |
73 | * than the minimal ESC sequence size, the "n=0" below | 73 | * It is tempting to read more than one byte here, |
74 | * would instead have to figure out how much to keep, | 74 | * but it breaks pasting. Example: at shell prompt, |
75 | * resulting in larger code. */ | 75 | * user presses "c","a","t" and then pastes "\nline\n". |
76 | n = safe_read(fd, buffer, 3); | 76 | * When we were reading 3 bytes here, we were eating |
77 | * "li" too, and cat was getting wrong input. | ||
78 | */ | ||
79 | n = safe_read(fd, buffer, 1); | ||
77 | if (n <= 0) | 80 | if (n <= 0) |
78 | return -1; | 81 | return -1; |
79 | } | 82 | } |