ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lineedit: invalid unicode characters are replaced with CONFIG_SUBST_WCHAR

Browse source 
function                                             old     new   delta
read_key_ungets                                        -      50     +50
lineedit_read_key                                    223     252     +29

Signed-off-by: Tomas Heinrich <heinrich.tomas@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Tomas Heinrich 2010-03-09 14:09:24 +01:00 • committed by Denys Vlasenko
parent f15620c377
commit d2b04050c0
4 changed files with 73 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
libbb/lineedit.c
View file

@ -1700,18 +1700,34 @@ static int lineedit_read_key(char *read_key_buffer)
#endif
#if ENABLE_FEATURE_ASSUME_UNICODE
{
if (unicode_status == UNICODE_ON) {
wchar_t wc;
if ((int32_t)ic < 0) /* KEYCODE_xxx */
return ic;
// TODO: imagine sequence like: 0xff, <left-arrow>: we are currently losing 0xff...
unicode_buf[unicode_idx++] = ic;
unicode_buf[unicode_idx] = '\0';
if (mbstowcs(&wc, unicode_buf, 1) != 1 && unicode_idx < MB_CUR_MAX) {
delay = 50;
goto poll_again;
if (mbstowcs(&wc, unicode_buf, 1) != 1) {
/* Not (yet?) a valid unicode char */
if (unicode_idx < MB_CUR_MAX) {
delay = 50;
goto poll_again;
}
/* Invalid sequence. Save all "bad bytes" except first */
read_key_ungets(read_key_buffer, unicode_buf + 1, MB_CUR_MAX - 1);
/*
* ic = unicode_buf[0] sounds even better, but currently
* this does not work: wchar_t[] -> char[] conversion
* when lineedit finishes mangles such "raw bytes"
* (by misinterpreting them as unicode chars):
*/
ic = CONFIG_SUBST_WCHAR;
} else {
/* Valid unicode char, return its code */
ic = wc;
}
ic = wc;
}
#endif
} while (errno == EAGAIN);