diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:03:18 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:05:39 +0000 |
| commit | 492d0a7492a57fe8f02c766e25960b0ce0d88759 (patch) | |
| tree | 4f5764a5c2250c031ea05e9aeacbb40d7971f493 /miscutils/less.c | |
| parent | 4734416a21312488a5099a297907783bee4ccc22 (diff) | |
| parent | caa9c4f707b661cf398f2c2d66f54f5b0d8adfe2 (diff) | |
| download | busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.gz busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.bz2 busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.zip | |
Merge busybox into merge
Fix conflicts in reset and ash.
Redefine the new safe_read_key() as a reference to read_key().
Disable SHA256_HWACCEL.
Diffstat (limited to 'miscutils/less.c')
| -rw-r--r-- | miscutils/less.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miscutils/less.c b/miscutils/less.c index 6da991a0e..842031ca3 100644 --- a/miscutils/less.c +++ b/miscutils/less.c | |||
| @@ -1177,9 +1177,9 @@ static int64_t getch_nowait(void) | |||
| 1177 | #endif | 1177 | #endif |
| 1178 | } | 1178 | } |
| 1179 | 1179 | ||
| 1180 | /* We have kbd_fd in O_NONBLOCK mode, read inside read_key() | 1180 | /* We have kbd_fd in O_NONBLOCK mode, read inside safe_read_key() |
| 1181 | * would not block even if there is no input available */ | 1181 | * would not block even if there is no input available */ |
| 1182 | key64 = read_key(kbd_fd, kbd_input, /*timeout off:*/ -2); | 1182 | key64 = safe_read_key(kbd_fd, kbd_input, /*timeout off:*/ -2); |
| 1183 | if ((int)key64 == -1) { | 1183 | if ((int)key64 == -1) { |
| 1184 | if (errno == EAGAIN) { | 1184 | if (errno == EAGAIN) { |
| 1185 | /* No keyboard input available. Since poll() did return, | 1185 | /* No keyboard input available. Since poll() did return, |