Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-17 16:30:26 +00:00
Code Issues Projects Releases Wiki Activity

less: yet another attempt to make search better

Browse Source
This commit is contained in:
Denis Vlasenko 2007-03-08 17:52:36 +00:00
parent 5c1de36702
commit 18d6fc1a50
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
miscutils/less.c
View File

@ -21,6 +21,8 @@
* redirected input has been read from stdin * redirected input has been read from stdin
*/ */
#include <sched.h> /* sched_yield() */
#include "busybox.h" #include "busybox.h"
#if ENABLE_FEATURE_LESS_REGEXP #if ENABLE_FEATURE_LESS_REGEXP
#include "xregex.h" #include "xregex.h"
@ -200,16 +202,30 @@ static void read_lines(void)
char c; char c;
/* if no unprocessed chars left, eat more */ /* if no unprocessed chars left, eat more */
if (readpos >= readeof) { if (readpos >= readeof) {
smallint yielded = 0;
ndelay_on(0); ndelay_on(0);
read_again:
eof_error = safe_read(0, readbuf, sizeof(readbuf)); eof_error = safe_read(0, readbuf, sizeof(readbuf));
ndelay_off(0);
readpos = 0; readpos = 0;
readeof = eof_error; readeof = eof_error;
if (eof_error < 0) { if (eof_error < 0) {
if (errno == EAGAIN && !yielded) {
/* We can hit EAGAIN while searching for regexp match.
* Yield is not 100% reliable solution in general,
* but for less it should be good enough.
* We give stdin supplier some CPU time to produce more.
* We do it just once. */
sched_yield();
yielded = 1;
goto read_again;
}
readeof = 0; readeof = 0;
if (errno != EAGAIN) if (errno != EAGAIN)
print_statusline("read error"); print_statusline("read error");
} }
ndelay_off(0);
if (eof_error <= 0) { if (eof_error <= 0) {
goto reached_eof; goto reached_eof;
} }