h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-19 18:01:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Encode all ENCODE_DIRECT codepoints with encode_direct

Browse Source 
forward-port of 09986f5563
This commit is contained in:
Fabian Boehm
2023-12-10 09:29:42 +01:00
parent e380654fff
commit eb196c8330
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common.cpp
View File

@@ -328,12 +328,10 @@ static wcstring str2wcs_internal(const char *in, const size_t in_len) {
} else {
ret = std::mbrtowc(&wc, &in[in_pos], in_len - in_pos, &state);
// Determine whether to encode this character with our crazy scheme.
if (wc >= ENCODE_DIRECT_BASE && wc < ENCODE_DIRECT_BASE + 256) {
if (fish_reserved_codepoint(wc)) {
use_encode_direct = true;
} else if ((wc >= 0xD800 && wc <= 0xDFFF) || static_cast<uint32_t>(wc) >= 0x110000) {
use_encode_direct = true;
} else if (wc == INTERNAL_SEPARATOR) {
use_encode_direct = true;
} else if (ret == static_cast<size_t>(-2)) {
// Incomplete sequence.
use_encode_direct = true;