diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-27 10:09:59 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-27 10:09:59 +0000 |
commit | 5d61e71c3a8ac3296afbfe9a014c62050c5a9234 (patch) | |
tree | e9ab2cd35d1f2d51b26a678551a0439b1719928b /editors/vi.c | |
parent | c9dc2ac578278e86be248cc21e53081f7054da83 (diff) | |
download | busybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.tar.gz busybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.tar.bz2 busybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.zip |
introduce safe_poll (fixes a problem in top)
function old new delta
safe_poll - 77 +77
svlogd_main 1470 1466 -4
zcip_main 1530 1524 -6
forkexec 1345 1338 -7
decode_format_string 795 788 -7
collect_blk 474 467 -7
buffer_pread 540 532 -8
tftp 1182 1172 -10
microcom_main 763 749 -14
arpping 441 424 -17
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/9 up/down: 77/-80) Total: -3 bytes
text data bss dec hex filename
770162 1034 10404 781600 bed20 busybox_old
770158 1034 10404 781596 bed1c busybox_unstripped
Diffstat (limited to 'editors/vi.c')
-rw-r--r-- | editors/vi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/vi.c b/editors/vi.c index f5df41636..1fa7c3a09 100644 --- a/editors/vi.c +++ b/editors/vi.c | |||
@@ -2139,7 +2139,7 @@ static int mysleep(int hund) // sleep for 'h' 1/100 seconds | |||
2139 | 2139 | ||
2140 | pfd[0].fd = 0; | 2140 | pfd[0].fd = 0; |
2141 | pfd[0].events = POLLIN; | 2141 | pfd[0].events = POLLIN; |
2142 | return poll(pfd, 1, hund*10) > 0; | 2142 | return safe_poll(pfd, 1, hund*10) > 0; |
2143 | } | 2143 | } |
2144 | 2144 | ||
2145 | #define readbuffer bb_common_bufsiz1 | 2145 | #define readbuffer bb_common_bufsiz1 |
@@ -2221,7 +2221,7 @@ static char readit(void) // read (maybe cursor) key from stdin | |||
2221 | pfd[0].events = POLLIN; | 2221 | pfd[0].events = POLLIN; |
2222 | // Wait 50 ms | 2222 | // Wait 50 ms |
2223 | // keep reading while there are input chars and room in buffer | 2223 | // keep reading while there are input chars and room in buffer |
2224 | while (poll(pfd, 1, 50) > 0 && n <= (MAX_LINELEN - 5)) { | 2224 | while (safe_poll(pfd, 1, 50) > 0 && n <= (MAX_LINELEN - 5)) { |
2225 | // read the rest of the ESC string | 2225 | // read the rest of the ESC string |
2226 | int r = read(0, readbuffer + n, MAX_LINELEN - n); | 2226 | int r = read(0, readbuffer + n, MAX_LINELEN - n); |
2227 | if (r > 0) | 2227 | if (r > 0) |