[git commit master] lineedit: REALLY fix compile error now

Denys Vlasenko vda.linux at googlemail.com
Thu Oct 29 02:45:26 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=1f6d2307bafd1e55addac5fc28a71f59fc3bd5ba
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 libbb/lineedit.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 42185dc..0f7ab8c 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1662,6 +1662,9 @@ static int lineedit_read_key(char *read_key_buffer)
 	pfd.fd = STDIN_FILENO;
 	pfd.events = POLLIN;
 	do {
+#if ENABLE_FEATURE_EDITING_ASK_TERMINAL || ENABLE_FEATURE_ASSUME_UNICODE
+ poll_again:
+#endif
 		if (read_key_buffer[0] == 0) {
 			/* Wait for input. Can't just call read_key,
 			 * it returns at once if stdin
@@ -1686,7 +1689,7 @@ static int lineedit_read_key(char *read_key_buffer)
 					}
 				}
 			}
-			continue;
+			goto poll_again;
 		}
 #endif
 
@@ -1700,7 +1703,7 @@ static int lineedit_read_key(char *read_key_buffer)
 			unicode_buf[unicode_idx] = '\0';
 			if (mbstowcs(&wc, unicode_buf, 1) != 1 && unicode_idx < MB_CUR_MAX) {
 				delay = 50;
-				continue;
+				goto poll_again;
 			}
 			ic = wc;
 		}
-- 
1.6.3.3



More information about the busybox-cvs mailing list