diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2014-02-26 09:36:43 -0500 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2014-02-26 09:36:43 -0500 |
| commit | ac50fbac377e32b98d2de396f016ea81e8ee9961 (patch) | |
| tree | f71882366b98fedf1a88a063103219a4935de926 /lib/readline/mbutil.c | |
| parent | 4539d736f1aff232857a854fd2a68df0c98d9f34 (diff) | |
| download | android_external_bash-ac50fbac377e32b98d2de396f016ea81e8ee9961.tar.gz android_external_bash-ac50fbac377e32b98d2de396f016ea81e8ee9961.tar.bz2 android_external_bash-ac50fbac377e32b98d2de396f016ea81e8ee9961.zip | |
Bash-4.3 distribution sources and documentation
Diffstat (limited to 'lib/readline/mbutil.c')
| -rw-r--r-- | lib/readline/mbutil.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/readline/mbutil.c b/lib/readline/mbutil.c index eeb7e55..b036e0c 100644 --- a/lib/readline/mbutil.c +++ b/lib/readline/mbutil.c @@ -64,6 +64,9 @@ int rl_byte_oriented = 0; int rl_byte_oriented = 1; #endif +/* Ditto */ +int _rl_utf8locale = 0; + /* **************************************************************** */ /* */ /* Multibyte Character Utility Functions */ @@ -119,7 +122,7 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero) point += tmp; if (find_non_zero) { - if (wcwidth (wc) == 0) + if (WCWIDTH (wc) == 0) continue; else count--; @@ -132,7 +135,7 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero) if (find_non_zero) { tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps); - while (MB_NULLWCH (tmp) == 0 && MB_INVALIDCH (tmp) == 0 && wcwidth (wc) == 0) + while (MB_NULLWCH (tmp) == 0 && MB_INVALIDCH (tmp) == 0 && WCWIDTH (wc) == 0) { point += tmp; tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps); @@ -184,7 +187,7 @@ _rl_find_prev_mbchar_internal (string, seed, find_non_zero) { if (find_non_zero) { - if (wcwidth (wc) != 0) + if (WCWIDTH (wc) != 0) prev = point; } else @@ -263,7 +266,7 @@ _rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2) if point is invalied (point < 0 || more than string length), it returns -1 */ int -_rl_adjust_point(string, point, ps) +_rl_adjust_point (string, point, ps) char *string; int point; mbstate_t *ps; |