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

lineedit: use unicode_strwidth instead of unicode_strlen

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-08-20 16:13:05 +02:00
parent 0ff0b320a2
commit 1b9ac21166
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libbb/lineedit.c
View File

@ -1774,7 +1774,7 @@ static void parse_and_put_prompt(const char *prmt_ptr)
const char *p; const char *p;
cmdedit_prompt = prmt_ptr; cmdedit_prompt = prmt_ptr;
p = strrchr(prmt_ptr, '\n'); p = strrchr(prmt_ptr, '\n');
cmdedit_prmt_len = unicode_strlen(p ? p+1 : prmt_ptr); cmdedit_prmt_len = unicode_strwidth(p ? p+1 : prmt_ptr);
put_prompt(); put_prompt();
} }
#else #else
@ -1943,7 +1943,7 @@ static void parse_and_put_prompt(const char *prmt_ptr)
#if 0 /*ENABLE_UNICODE_SUPPORT*/ #if 0 /*ENABLE_UNICODE_SUPPORT*/
/* Won't work, pbuf is one BYTE string here instead of an one Unicode char string. */ /* Won't work, pbuf is one BYTE string here instead of an one Unicode char string. */
/* FIXME */ /* FIXME */
cmdedit_prmt_len += unicode_strlen(pbuf); cmdedit_prmt_len += unicode_strwidth(pbuf);
#else #else
cmdedit_prmt_len += n; cmdedit_prmt_len += n;
#endif #endif
@ -2202,7 +2202,7 @@ static int32_t reverse_i_search(void)
free((char*)cmdedit_prompt); free((char*)cmdedit_prompt);
set_prompt: set_prompt:
cmdedit_prompt = xasprintf("(reverse-i-search)'%s': ", match_buf); cmdedit_prompt = xasprintf("(reverse-i-search)'%s': ", match_buf);
cmdedit_prmt_len = unicode_strlen(cmdedit_prompt); cmdedit_prmt_len = unicode_strwidth(cmdedit_prompt);
goto do_redraw; goto do_redraw;
} }
} }