Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-12 21:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

detect if the magic fish wide chars can be encoded

Browse source 
Verified on Cygwin on MS Windows 7 when invoked as
`env LANG=zh_CN.GBK@cjknarrow fish`. No regression seen
when run on other systems with UTF-8 locales.

Fixes #3503
This commit is contained in:
Kurtis Rader 2016-11-05 22:03:20 -07:00
parent 9e922a6e02
commit 609100c196
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/common.cpp
View file

@ -282,7 +282,7 @@ std::string wcs2string(const wcstring &input) {
result.reserve(input.size()); result.reserve(input.size());
mbstate_t state = {}; mbstate_t state = {};
char converted[MB_LEN_MAX + 1]; char converted[MB_LEN_MAX];
for (size_t i = 0; i < input.size(); i++) { for (size_t i = 0; i < input.size(); i++) {
wchar_t wc = input[i]; wchar_t wc = input[i];
@ -300,8 +300,8 @@ std::string wcs2string(const wcstring &input) {
} else { } else {
memset(converted, 0, sizeof converted); memset(converted, 0, sizeof converted);
size_t len = wcrtomb(converted, wc, &state); size_t len = wcrtomb(converted, wc, &state);
if (len == (size_t)(-1)) { if (len == (size_t)-1) {
debug(1, L"Wide character %d has no narrow representation", wc); debug(1, L"Wide character U+%4X has no narrow representation", wc);
memset(&state, 0, sizeof(state)); memset(&state, 0, sizeof(state));
} else { } else {
result.append(converted, len); result.append(converted, len);
@ -341,7 +341,7 @@ static char *wcs2str_internal(const wchar_t *in, char *out) {
} else { } else {
size_t len = wcrtomb(&out[out_pos], in[in_pos], &state); size_t len = wcrtomb(&out[out_pos], in[in_pos], &state);
if (len == (size_t)-1) { if (len == (size_t)-1) {
debug(1, L"Wide character %d has no narrow representation", in[in_pos]); debug(1, L"Wide character U+%4X has no narrow representation", in[in_pos]);
memset(&state, 0, sizeof(state)); memset(&state, 0, sizeof(state));
} else { } else {
out_pos += len; out_pos += len;
@ -354,6 +354,14 @@ static char *wcs2str_internal(const wchar_t *in, char *out) {
return out; return out;
} }
/// Test if the character can be encoded using the current locale.
static bool can_be_encoded(wchar_t wc) {
char converted[MB_LEN_MAX];
mbstate_t state = {};
return wcrtomb(converted, wc, &state) != (size_t)-1;
}
wcstring format_string(const wchar_t *format, ...) { wcstring format_string(const wchar_t *format, ...) {
va_list va; va_list va;
va_start(va, format); va_start(va, format);
@ -444,11 +452,11 @@ wchar_t *quote_end(const wchar_t *pos) {
} }
void fish_setlocale() { void fish_setlocale() {
// Use ellipsis if on known unicode system, otherwise use $. // Use the Unicode "ellipsis" symbol if it can be encoded using the current locale.
ellipsis_char = (fish_wcwidth(L'\x2026') > 0) ? L'\x2026' : L'$'; ellipsis_char = can_be_encoded(L'\x2026') ? L'\x2026' : L'$';
// U+23CE is the "return" character // Use the Unicode "return" symbol if it can be encoded using the current locale.
omitted_newline_char = (fish_wcwidth(L'\x23CE') > 0) ? L'\x23CE' : L'~'; omitted_newline_char = can_be_encoded(L'\x23CE') ? L'\x23CE' : L'~';
} }
bool contains_internal(const wchar_t *a, int vararg_handle, ...) { bool contains_internal(const wchar_t *a, int vararg_handle, ...) {