summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2008-10-14 10:25:05 +0000
committerDenis Vlasenko2008-10-14 10:25:05 +0000
commit25497c1d92dadafa51ee1e7789f9b0c9c6171963 (patch)
treeeac7fd688a86a9509c1930b11aefb7d500cb2ffe
parent5373fbcd1140a9fb4b2e259c04cdd79d4b80bc3b (diff)
downloadbusybox-25497c1d92dadafa51ee1e7789f9b0c9c6171963.zip
busybox-25497c1d92dadafa51ee1e7789f9b0c9c6171963.tar.gz
vi: reinstate timeout of 300 ms
-rw-r--r--editors/vi.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/editors/vi.c b/editors/vi.c
index e1cd7a4..f7d3ef6 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -209,8 +209,12 @@ struct globals {
char *initial_cmds[3]; // currently 2 entries, NULL terminated
#endif
// Should be just enough to hold a key sequence,
- // but CRASME mode uses it as generated command buffer too
- char readbuffer[8];
+ // but CRASHME mode uses it as generated command buffer too
+#if ENABLE_FEATURE_VI_CRASHME
+ char readbuffer[128];
+#else
+ char readbuffer[8];
+#endif
#define STATUS_BUFFER_LEN 200
char status_buffer[STATUS_BUFFER_LEN]; // messages to the user
#if ENABLE_FEATURE_VI_DOT_CMD
@@ -2283,8 +2287,8 @@ static char readit(void) // read (maybe cursor) key from stdin
struct pollfd pfd;
pfd.fd = 0;
pfd.events = POLLIN;
- // TODO: what is a good timeout here? why?
- if (safe_poll(&pfd, 1, /*timeout:*/ 0)) {
+ // Rob needed 300ms timeout on qemu
+ if (safe_poll(&pfd, 1, /*timeout:*/ 300)) {
if (safe_read(0, readbuffer + n, 1) <= 0)
goto error;
n++;