emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vi: reinstate timeout of 300 ms

Browse Source
This commit is contained in:
Denis Vlasenko 2008-10-14 10:25:05 +00:00
parent 5373fbcd11
commit 25497c1d92
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editors/vi.c
View File

@ -209,8 +209,12 @@ struct globals {
char *initial_cmds[3]; // currently 2 entries, NULL terminated char *initial_cmds[3]; // currently 2 entries, NULL terminated
#endif #endif
// Should be just enough to hold a key sequence, // Should be just enough to hold a key sequence,
// but CRASME mode uses it as generated command buffer too // but CRASHME mode uses it as generated command buffer too
char readbuffer[8]; #if ENABLE_FEATURE_VI_CRASHME
char readbuffer[128];
#else
char readbuffer[8];
#endif
#define STATUS_BUFFER_LEN 200 #define STATUS_BUFFER_LEN 200
char status_buffer[STATUS_BUFFER_LEN]; // messages to the user char status_buffer[STATUS_BUFFER_LEN]; // messages to the user
#if ENABLE_FEATURE_VI_DOT_CMD #if ENABLE_FEATURE_VI_DOT_CMD
@ -2283,8 +2287,8 @@ static char readit(void) // read (maybe cursor) key from stdin
struct pollfd pfd; struct pollfd pfd;
pfd.fd = 0; pfd.fd = 0;
pfd.events = POLLIN; pfd.events = POLLIN;
// TODO: what is a good timeout here? why? // Rob needed 300ms timeout on qemu
if (safe_poll(&pfd, 1, /*timeout:*/ 0)) { if (safe_poll(&pfd, 1, /*timeout:*/ 300)) {
if (safe_read(0, readbuffer + n, 1) <= 0) if (safe_read(0, readbuffer + n, 1) <= 0)
goto error; goto error;
n++; n++;